Assorted message style improvements

petere · petere · commit 2b44306315cf · 2012-07-02T21:12:46.000+03:00
diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
@@ -661,7 +661,7 @@ spgFormInnerTuple(SpGistState *state, bool hasPrefix, Datum prefix,
 	if (size > SPGIST_PAGE_CAPACITY - sizeof(ItemIdData))
 		ereport(ERROR,
 				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-				 errmsg("SPGiST inner tuple size %lu exceeds maximum %lu",
+				 errmsg("SP-GiST inner tuple size %lu exceeds maximum %lu",
 						(unsigned long) size,
 				(unsigned long) (SPGIST_PAGE_CAPACITY - sizeof(ItemIdData))),
 			errhint("Values larger than a buffer page cannot be indexed.")));
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -6355,7 +6355,7 @@ StartupXLOG(void)
 			{
 				if (dbstate_at_startup != DB_IN_ARCHIVE_RECOVERY)
 					ereport(FATAL,
-							(errmsg("backup_label contains inconsistent data with control file"),
+							(errmsg("backup_label contains data inconsistent with control file"),
 							 errhint("This means that the backup is corrupted and you will "
 							   "have to use another backup for recovery.")));
 				ControlFile->backupEndPoint = ControlFile->minRecoveryPoint;
diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
@@ -1834,7 +1834,7 @@ range_parse_flags(const char *flags_str)
 		ereport(ERROR,
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("invalid range bound flags"),
-				 errhint("Valid values are '[]', '[)', '(]', and '()'.")));
+				 errhint("Valid values are \"[]\", \"[)\", \"(]\", and \"()\".")));
 
 	switch (flags_str[0])
 	{
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -1722,7 +1722,7 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"temp_file_limit", PGC_SUSET, RESOURCES_DISK,
-			gettext_noop("Limits the total size of all temp files used by each session."),
+			gettext_noop("Limits the total size of all temporary files used by each session."),
 			gettext_noop("-1 means no limit."),
 			GUC_UNIT_KB
 		},
diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
@@ -1011,7 +1011,7 @@ ImportSnapshot(const char *idstr)
 	if (strspn(idstr, "0123456789ABCDEF-") != strlen(idstr))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid snapshot identifier \"%s\"", idstr)));
+				 errmsg("invalid snapshot identifier: \"%s\"", idstr)));
 
 	/* OK, read the file */
 	snprintf(path, MAXPGPATH, SNAPSHOT_EXPORT_DIR "/%s", idstr);
@@ -1020,7 +1020,7 @@ ImportSnapshot(const char *idstr)
 	if (!f)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid snapshot identifier \"%s\"", idstr)));
+				 errmsg("invalid snapshot identifier: \"%s\"", idstr)));
 
 	/* get the size of the file so that we know how much memory we need */
 	if (fstat(fileno(f), &stat_buf))
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
@@ -154,7 +154,7 @@ GetConnection(void)
 
 		if (PQstatus(tmpconn) != CONNECTION_OK)
 		{
-			fprintf(stderr, _("%s: could not connect to server: %s\n"),
+			fprintf(stderr, _("%s: could not connect to server: %s"),
 					progname, PQerrorMessage(tmpconn));
 			return NULL;
 		}
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -1935,7 +1935,7 @@ adjust_data_dir(void)
 	fd = popen(cmd, "r");
 	if (fd == NULL || fgets(filename, sizeof(filename), fd) == NULL)
 	{
-		write_stderr(_("%s: could not determine the data directory using \"%s\"\n"), progname, cmd);
+		write_stderr(_("%s: could not determine the data directory using command \"%s\"\n"), progname, cmd);
 		exit(1);
 	}
 	pclose(fd);
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
@@ -462,7 +462,7 @@ AcceptResult(const PGresult *result)
 
 			default:
 				OK = false;
-				psql_error("unexpected PQresultStatus (%d)",
+				psql_error("unexpected PQresultStatus: %d\n",
 						   PQresultStatus(result));
 				break;
 		}
@@ -686,7 +686,7 @@ ProcessResult(PGresult **results)
 			default:
 				/* AcceptResult() should have caught anything else. */
 				is_copy = false;
-				psql_error("unexpected PQresultStatus (%d)", result_status);
+				psql_error("unexpected PQresultStatus: %d\n", result_status);
 				break;
 		}
 
@@ -816,7 +816,7 @@ PrintQueryResults(PGresult *results)
 
 		default:
 			success = false;
-			psql_error("unexpected PQresultStatus (%d)",
+			psql_error("unexpected PQresultStatus: %d\n",
 					   PQresultStatus(results));
 			break;
 	}
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
@@ -112,7 +112,7 @@ ParseVariableBool(const char *value)
 	else
 	{
 		/* NULL is treated as false, so a non-matching value is 'true' */
-		psql_error("unrecognized boolean value; assuming \"on\".\n");
+		psql_error("unrecognized Boolean value; assuming \"on\"\n");
 		return true;
 	}
 	/* suppress compiler warning */
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -4651,14 +4651,14 @@ conninfo_uri_parse_options(PQconninfoOption *options, const char *uri,
 		if (!*p)
 		{
 			printfPQExpBuffer(errorMessage,
-							  libpq_gettext("end of string reached when looking for matching ']' in IPv6 host address in URI: %s\n"),
+							  libpq_gettext("end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\"\n"),
 							  uri);
 			goto cleanup;
 		}
 		if (p == host)
 		{
 			printfPQExpBuffer(errorMessage,
-			libpq_gettext("IPv6 host address may not be empty in URI: %s\n"),
+			libpq_gettext("IPv6 host address may not be empty in URI: \"%s\"\n"),
 							  uri);
 			goto cleanup;
 		}
@@ -4673,7 +4673,7 @@ conninfo_uri_parse_options(PQconninfoOption *options, const char *uri,
 		if (*p && *p != ':' && *p != '/' && *p != '?')
 		{
 			printfPQExpBuffer(errorMessage,
-							  libpq_gettext("unexpected '%c' at position %d in URI (expecting ':' or '/'): %s\n"),
+							  libpq_gettext("unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\"\n"),
 							  *p, (int) (p - buf + 1), uri);
 			goto cleanup;
 		}
@@ -4787,7 +4787,7 @@ conninfo_uri_parse_params(char *params,
 				if (value != NULL)
 				{
 					printfPQExpBuffer(errorMessage,
-									  libpq_gettext("extra key/value separator '=' in URI query parameter: %s\n"),
+									  libpq_gettext("extra key/value separator \"=\" in URI query parameter: \"%s\"\n"),
 									  params);
 					return false;
 				}
@@ -4807,7 +4807,7 @@ conninfo_uri_parse_params(char *params,
 				if (value == NULL)
 				{
 					printfPQExpBuffer(errorMessage,
-									  libpq_gettext("missing key/value separator '=' in URI query parameter: %s\n"),
+									  libpq_gettext("missing key/value separator \"=\" in URI query parameter: \"%s\"\n"),
 									  params);
 					return false;
 				}
@@ -4878,7 +4878,7 @@ conninfo_uri_parse_params(char *params,
 
 			printfPQExpBuffer(errorMessage,
 							  libpq_gettext(
-									 "invalid URI query parameter \"%s\"\n"),
+									 "invalid URI query parameter: \"%s\"\n"),
 							  keyword);
 			return false;
 		}
@@ -4943,7 +4943,7 @@ conninfo_uri_decode(const char *str, PQExpBuffer errorMessage)
 			if (!(get_hexdigit(*q++, &hi) && get_hexdigit(*q++, &lo)))
 			{
 				printfPQExpBuffer(errorMessage,
-						libpq_gettext("invalid percent-encoded token: %s\n"),
+						libpq_gettext("invalid percent-encoded token: \"%s\"\n"),
 								  str);
 				free(buf);
 				return NULL;
@@ -4953,7 +4953,7 @@ conninfo_uri_decode(const char *str, PQExpBuffer errorMessage)
 			if (c == 0)
 			{
 				printfPQExpBuffer(errorMessage,
-								  libpq_gettext("forbidden value %%00 in percent-encoded value: %s\n"),
+								  libpq_gettext("forbidden value %%00 in percent-encoded value: \"%s\"\n"),
 								  str);
 				free(buf);
 				return NULL;
diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c
@@ -319,7 +319,7 @@ winsock_strerror(int err, char *strerrbuf, size_t buflen)
 	}
 
 	if (!success)
-		sprintf(strerrbuf, libpq_gettext("Unknown socket error (0x%08X/%d)"), err, err);
+		sprintf(strerrbuf, libpq_gettext("unrecognized socket error: 0x%08X/%d"), err, err);
 	else
 	{
 		strerrbuf[buflen - 1] = '\0';
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
@@ -3483,8 +3483,8 @@ read_cursor_args(PLpgSQL_var *cursor, int until, const char *expected)
 		if (argv[argpos] != NULL)
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("duplicate value for cursor \"%s\" parameter \"%s\"",
-							cursor->refname, row->fieldnames[argpos]),
+					 errmsg("value for parameter \"%s\" of cursor \"%s\" specified more than once",
+							row->fieldnames[argpos], cursor->refname),
 					 parser_errposition(arglocation)));
 
 		/*
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
@@ -2347,7 +2347,7 @@ begin
     open c1(param2 := 20, 21);
 end
 $$ language plpgsql;
-ERROR:  duplicate value for cursor "c1" parameter "param2"
+ERROR:  value for parameter "param2" of cursor "c1" specified more than once
 LINE 5:     open c1(param2 := 20, 21);
                                   ^
 -- mixing named and positional: same as previous test, but param1 is duplicated
@@ -2358,7 +2358,7 @@ begin
     open c1(20, param1 := 21);
 end
 $$ language plpgsql;
-ERROR:  duplicate value for cursor "c1" parameter "param1"
+ERROR:  value for parameter "param1" of cursor "c1" specified more than once
 LINE 5:     open c1(20, param1 := 21);
                         ^
 -- duplicate named parameter, should throw an error at parse time
@@ -2370,7 +2370,7 @@ begin
   open c1 (p2 := 77, p2 := 42);
 end
 $$ language plpgsql;
-ERROR:  duplicate value for cursor "c1" parameter "p2"
+ERROR:  value for parameter "p2" of cursor "c1" specified more than once
 LINE 6:   open c1 (p2 := 77, p2 := 42);
                              ^
 -- not enough parameters, should throw an error at parse time

Original file line number	Diff line number	Diff line change
`@@ -6355,7 +6355,7 @@ StartupXLOG(void)`
`6355`	`6355`	`{`
`6356`	`6356`	`if (dbstate_at_startup != DB_IN_ARCHIVE_RECOVERY)`
`6357`	`6357`	`ereport(FATAL,`
`6358`		`- (errmsg("backup_label contains inconsistent data with control file"),`
	`6358`	`+ (errmsg("backup_label contains data inconsistent with control file"),`
`6359`	`6359`	`errhint("This means that the backup is corrupted and you will "`
`6360`	`6360`	`"have to use another backup for recovery.")));`
`6361`	`6361`	`ControlFile->backupEndPoint = ControlFile->minRecoveryPoint;`
Original file line number	Diff line number	Diff line change
`@@ -1834,7 +1834,7 @@ range_parse_flags(const char *flags_str)`
`1834`	`1834`	`ereport(ERROR,`
`1835`	`1835`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`1836`	`1836`	`errmsg("invalid range bound flags"),`
`1837`		`- errhint("Valid values are '[]', '[)', '(]', and '()'.")));`
	`1837`	`+ errhint("Valid values are \"[]\", \"[)\", \"(]\", and \"()\".")));`
`1838`	`1838`
`1839`	`1839`	`switch (flags_str[0])`
`1840`	`1840`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1722,7 +1722,7 @@ static struct config_int ConfigureNamesInt[] =`
`1722`	`1722`
`1723`	`1723`	`{`
`1724`	`1724`	`{"temp_file_limit", PGC_SUSET, RESOURCES_DISK,`
`1725`		`- gettext_noop("Limits the total size of all temp files used by each session."),`
	`1725`	`+ gettext_noop("Limits the total size of all temporary files used by each session."),`
`1726`	`1726`	`gettext_noop("-1 means no limit."),`
`1727`	`1727`	`GUC_UNIT_KB`
`1728`	`1728`	`},`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ GetConnection(void)`
`154`	`154`
`155`	`155`	`if (PQstatus(tmpconn) != CONNECTION_OK)`
`156`	`156`	`{`
`157`		`- fprintf(stderr, _("%s: could not connect to server: %s\n"),`
	`157`	`+ fprintf(stderr, _("%s: could not connect to server: %s"),`
`158`	`158`	`progname, PQerrorMessage(tmpconn));`
`159`	`159`	`return NULL;`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1935,7 +1935,7 @@ adjust_data_dir(void)`
`1935`	`1935`	`fd = popen(cmd, "r");`
`1936`	`1936`	`if (fd == NULL \|\| fgets(filename, sizeof(filename), fd) == NULL)`
`1937`	`1937`	`{`
`1938`		`- write_stderr(_("%s: could not determine the data directory using \"%s\"\n"), progname, cmd);`
	`1938`	`+ write_stderr(_("%s: could not determine the data directory using command \"%s\"\n"), progname, cmd);`
`1939`	`1939`	`exit(1);`
`1940`	`1940`	`}`
`1941`	`1941`	`pclose(fd);`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ ParseVariableBool(const char *value)`
`112`	`112`	`else`
`113`	`113`	`{`
`114`	`114`	`/* NULL is treated as false, so a non-matching value is 'true' */`
`115`		`- psql_error("unrecognized boolean value; assuming \"on\".\n");`
	`115`	`+ psql_error("unrecognized Boolean value; assuming \"on\"\n");`
`116`	`116`	`return true;`
`117`	`117`	`}`
`118`	`118`	`/* suppress compiler warning */`
Original file line number	Diff line number	Diff line change
`@@ -4651,14 +4651,14 @@ conninfo_uri_parse_options(PQconninfoOption options, const char uri,`
`4651`	`4651`	`if (!*p)`
`4652`	`4652`	`{`
`4653`	`4653`	`printfPQExpBuffer(errorMessage,`
`4654`		`- libpq_gettext("end of string reached when looking for matching ']' in IPv6 host address in URI: %s\n"),`
	`4654`	`+ libpq_gettext("end of string reached when looking for matching \"]\" in IPv6 host address in URI: \"%s\"\n"),`
`4655`	`4655`	`uri);`
`4656`	`4656`	`goto cleanup;`
`4657`	`4657`	`}`
`4658`	`4658`	`if (p == host)`
`4659`	`4659`	`{`
`4660`	`4660`	`printfPQExpBuffer(errorMessage,`
`4661`		`- libpq_gettext("IPv6 host address may not be empty in URI: %s\n"),`
	`4661`	`+ libpq_gettext("IPv6 host address may not be empty in URI: \"%s\"\n"),`
`4662`	`4662`	`uri);`
`4663`	`4663`	`goto cleanup;`
`4664`	`4664`	`}`
`@@ -4673,7 +4673,7 @@ conninfo_uri_parse_options(PQconninfoOption options, const char uri,`
`4673`	`4673`	`if (p && p != ':' && p != '/' && p != '?')`
`4674`	`4674`	`{`
`4675`	`4675`	`printfPQExpBuffer(errorMessage,`
`4676`		`- libpq_gettext("unexpected '%c' at position %d in URI (expecting ':' or '/'): %s\n"),`
	`4676`	`+ libpq_gettext("unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): \"%s\"\n"),`
`4677`	`4677`	`*p, (int) (p - buf + 1), uri);`
`4678`	`4678`	`goto cleanup;`
`4679`	`4679`	`}`
`@@ -4787,7 +4787,7 @@ conninfo_uri_parse_params(char *params,`
`4787`	`4787`	`if (value != NULL)`
`4788`	`4788`	`{`
`4789`	`4789`	`printfPQExpBuffer(errorMessage,`
`4790`		`- libpq_gettext("extra key/value separator '=' in URI query parameter: %s\n"),`
	`4790`	`+ libpq_gettext("extra key/value separator \"=\" in URI query parameter: \"%s\"\n"),`
`4791`	`4791`	`params);`
`4792`	`4792`	`return false;`
`4793`	`4793`	`}`
`@@ -4807,7 +4807,7 @@ conninfo_uri_parse_params(char *params,`
`4807`	`4807`	`if (value == NULL)`
`4808`	`4808`	`{`
`4809`	`4809`	`printfPQExpBuffer(errorMessage,`
`4810`		`- libpq_gettext("missing key/value separator '=' in URI query parameter: %s\n"),`
	`4810`	`+ libpq_gettext("missing key/value separator \"=\" in URI query parameter: \"%s\"\n"),`
`4811`	`4811`	`params);`
`4812`	`4812`	`return false;`
`4813`	`4813`	`}`
`@@ -4878,7 +4878,7 @@ conninfo_uri_parse_params(char *params,`
`4878`	`4878`
`4879`	`4879`	`printfPQExpBuffer(errorMessage,`
`4880`	`4880`	`libpq_gettext(`
`4881`		`- "invalid URI query parameter \"%s\"\n"),`
	`4881`	`+ "invalid URI query parameter: \"%s\"\n"),`
`4882`	`4882`	`keyword);`
`4883`	`4883`	`return false;`
`4884`	`4884`	`}`
`@@ -4943,7 +4943,7 @@ conninfo_uri_decode(const char *str, PQExpBuffer errorMessage)`
`4943`	`4943`	`if (!(get_hexdigit(q++, &hi) && get_hexdigit(q++, &lo)))`
`4944`	`4944`	`{`
`4945`	`4945`	`printfPQExpBuffer(errorMessage,`
`4946`		`- libpq_gettext("invalid percent-encoded token: %s\n"),`
	`4946`	`+ libpq_gettext("invalid percent-encoded token: \"%s\"\n"),`
`4947`	`4947`	`str);`
`4948`	`4948`	`free(buf);`
`4949`	`4949`	`return NULL;`
`@@ -4953,7 +4953,7 @@ conninfo_uri_decode(const char *str, PQExpBuffer errorMessage)`
`4953`	`4953`	`if (c == 0)`
`4954`	`4954`	`{`
`4955`	`4955`	`printfPQExpBuffer(errorMessage,`
`4956`		`- libpq_gettext("forbidden value %%00 in percent-encoded value: %s\n"),`
	`4956`	`+ libpq_gettext("forbidden value %%00 in percent-encoded value: \"%s\"\n"),`
`4957`	`4957`	`str);`
`4958`	`4958`	`free(buf);`
`4959`	`4959`	`return NULL;`