Remove prefix "ERROR:" from some messages, to make everything consistent

petere · petere · commit e527d5010b3c · 2009-11-29T18:53:44.000Z
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.378 2009/11/28 23:38:08 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.379 2009/11/29 18:53:44 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3100,7 +3100,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 		f = fopen(serviceFile, "r");
 		if (f == NULL)
 		{
-			printfPQExpBuffer(errorMessage, libpq_gettext("ERROR: service file \"%s\" not found\n"),
+			printfPQExpBuffer(errorMessage, libpq_gettext("service file \"%s\" not found\n"),
 							  serviceFile);
 			return 1;
 		}
@@ -3113,7 +3113,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 			{
 				fclose(f);
 				printfPQExpBuffer(errorMessage,
-								  libpq_gettext("ERROR: line %d too long in service file \"%s\"\n"),
+								  libpq_gettext("line %d too long in service file \"%s\"\n"),
 								  linenr,
 								  serviceFile);
 				return 2;
@@ -3185,7 +3185,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 					if (val == NULL)
 					{
 						printfPQExpBuffer(errorMessage,
-										  libpq_gettext("ERROR: syntax error in service file \"%s\", line %d\n"),
+										  libpq_gettext("syntax error in service file \"%s\", line %d\n"),
 										  serviceFile,
 										  linenr);
 						fclose(f);
@@ -3212,7 +3212,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 					if (!found_keyword)
 					{
 						printfPQExpBuffer(errorMessage,
-										  libpq_gettext("ERROR: syntax error in service file \"%s\", line %d\n"),
+										  libpq_gettext("syntax error in service file \"%s\", line %d\n"),
 										  serviceFile,
 										  linenr);
 						fclose(f);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.378 2009/11/28 23:38:08 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.379 2009/11/29 18:53:44 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3100,7 +3100,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)`
`3100`	`3100`	`f = fopen(serviceFile, "r");`
`3101`	`3101`	`if (f == NULL)`
`3102`	`3102`	`{`
`3103`		`- printfPQExpBuffer(errorMessage, libpq_gettext("ERROR: service file \"%s\" not found\n"),`
	`3103`	`+ printfPQExpBuffer(errorMessage, libpq_gettext("service file \"%s\" not found\n"),`
`3104`	`3104`	`serviceFile);`
`3105`	`3105`	`return 1;`
`3106`	`3106`	`}`
`@@ -3113,7 +3113,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)`
`3113`	`3113`	`{`
`3114`	`3114`	`fclose(f);`
`3115`	`3115`	`printfPQExpBuffer(errorMessage,`
`3116`		`- libpq_gettext("ERROR: line %d too long in service file \"%s\"\n"),`
	`3116`	`+ libpq_gettext("line %d too long in service file \"%s\"\n"),`
`3117`	`3117`	`linenr,`
`3118`	`3118`	`serviceFile);`
`3119`	`3119`	`return 2;`
`@@ -3185,7 +3185,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)`
`3185`	`3185`	`if (val == NULL)`
`3186`	`3186`	`{`
`3187`	`3187`	`printfPQExpBuffer(errorMessage,`
`3188`		`- libpq_gettext("ERROR: syntax error in service file \"%s\", line %d\n"),`
	`3188`	`+ libpq_gettext("syntax error in service file \"%s\", line %d\n"),`
`3189`	`3189`	`serviceFile,`
`3190`	`3190`	`linenr);`
`3191`	`3191`	`fclose(f);`
`@@ -3212,7 +3212,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)`
`3212`	`3212`	`if (!found_keyword)`
`3213`	`3213`	`{`
`3214`	`3214`	`printfPQExpBuffer(errorMessage,`
`3215`		`- libpq_gettext("ERROR: syntax error in service file \"%s\", line %d\n"),`
	`3215`	`+ libpq_gettext("syntax error in service file \"%s\", line %d\n"),`
`3216`	`3216`	`serviceFile,`
`3217`	`3217`	`linenr);`
`3218`	`3218`	`fclose(f);`