Commit e527d501 authored by Peter Eisentraut's avatar Peter Eisentraut

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

parent 0c61cff5
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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) ...@@ -3100,7 +3100,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
f = fopen(serviceFile, "r"); f = fopen(serviceFile, "r");
if (f == NULL) 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); serviceFile);
return 1; return 1;
} }
...@@ -3113,7 +3113,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage) ...@@ -3113,7 +3113,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
{ {
fclose(f); fclose(f);
printfPQExpBuffer(errorMessage, 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, linenr,
serviceFile); serviceFile);
return 2; return 2;
...@@ -3185,7 +3185,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage) ...@@ -3185,7 +3185,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
if (val == NULL) if (val == NULL)
{ {
printfPQExpBuffer(errorMessage, 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, serviceFile,
linenr); linenr);
fclose(f); fclose(f);
...@@ -3212,7 +3212,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage) ...@@ -3212,7 +3212,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
if (!found_keyword) if (!found_keyword)
{ {
printfPQExpBuffer(errorMessage, 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, serviceFile,
linenr); linenr);
fclose(f); fclose(f);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment