A visit from the message-style police ...

8 files changed, 31 insertions, 31 deletions

diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 4c9990194ea..4f1234e35a0 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.110 2003/07/27 04:53:07 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.111 2003/07/28 00:09:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -727,7 +727,7 @@ abstime_timestamptz(PG_FUNCTION_ARGS)
 		case INVALID_ABSTIME:
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("cannot convert \"invalid\" abstime to timestamptz")));
+					 errmsg("cannot convert \"invalid\" abstime to timestamp")));
 			TIMESTAMP_NOBEGIN(result);
 			break;
 
diff --git a/src/backend/utils/adt/pseudotypes.c b/src/backend/utils/adt/pseudotypes.c
index 480c334b15b..78b132c5167 100644
--- a/src/backend/utils/adt/pseudotypes.c
+++ b/src/backend/utils/adt/pseudotypes.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/pseudotypes.c,v 1.8 2003/07/27 04:53:08 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/pseudotypes.c,v 1.9 2003/07/28 00:09:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@ record_in(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a constant of type record")));
+			 errmsg("cannot accept a value of type record")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
@@ -144,7 +144,7 @@ any_in(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a constant of type any")));
+			 errmsg("cannot accept a value of type any")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
@@ -171,7 +171,7 @@ anyarray_in(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a constant of type anyarray")));
+			 errmsg("cannot accept a value of type anyarray")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
@@ -249,7 +249,7 @@ trigger_in(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a constant of type trigger")));
+			 errmsg("cannot accept a value of type trigger")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
@@ -276,7 +276,7 @@ language_handler_in(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a constant of type language_handler")));
+			 errmsg("cannot accept a value of type language_handler")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
@@ -303,7 +303,7 @@ internal_in(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a constant of type internal")));
+			 errmsg("cannot accept a value of type internal")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
@@ -330,7 +330,7 @@ opaque_in(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a constant of type opaque")));
+			 errmsg("cannot accept a value of type opaque")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
@@ -357,7 +357,7 @@ anyelement_in(PG_FUNCTION_ARGS)
 {
 	ereport(ERROR,
 			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-			 errmsg("cannot accept a constant of type anyelement")));
+			 errmsg("cannot accept a value of type anyelement")));
 
 	PG_RETURN_VOID();			/* keep compiler quiet */
 }
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index fb9d5a2e458..584e3e5ae82 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.78 2003/07/27 04:53:09 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.79 2003/07/28 00:09:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1273,7 +1273,7 @@ parseNameAndArgTypes(const char *string, const char *caller,
 		if (*nargs >= FUNC_MAX_ARGS)
 			ereport(ERROR,
 					(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
-					 errmsg("too many argument datatypes")));
+					 errmsg("too many arguments")));
 
 		argtypes[*nargs] = typeid;
 		(*nargs)++;
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 2ebc0a949ba..a1e55ee71f5 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.105 2003/07/25 20:17:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.106 2003/07/28 00:09:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -766,7 +766,7 @@ CatalogCacheFlushRelation(Oid relId)
 #ifdef CACHEDEBUG
 #define InitCatCache_DEBUG2 \
 do { \
-	elog(DEBUG2, "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n", \
+	elog(DEBUG2, "InitCatCache: rel=%s id=%d nkeys=%d size=%d", \
 		cp->cc_relname, cp->id, cp->cc_nkeys, cp->cc_nbuckets); \
 } while(0)
 
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index e2a5a02af79..86bb40e738a 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.102 2003/07/25 20:17:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.103 2003/07/28 00:09:16 tgl Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -312,8 +312,8 @@ get_atttypetypmod(Oid relid, AttrNumber attnum,
 						Int16GetDatum(attnum),
 						0, 0);
 	if (!HeapTupleIsValid(tp))
-		elog(ERROR, "cache lookup failed for relation %u attribute %d",
-			 relid, attnum);
+		elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+			 attnum, relid);
 	att_tup = (Form_pg_attribute) GETSTRUCT(tp);
 
 	*typid = att_tup->atttypid;
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index d39791d39a1..fcadcdbd8ff 100644
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -7,7 +7,7 @@
  * Copyright (c) 2002, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/funcapi.c,v 1.7 2003/07/25 20:17:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/funcapi.c,v 1.8 2003/07/28 00:09:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@ init_MultiFuncCall(PG_FUNCTION_ARGS)
 	if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo))
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("set function called in context that does not accept a set result")));
+				 errmsg("set-valued function called in context that cannot accept a set")));
 
 	if (fcinfo->flinfo->fn_extra == NULL)
 	{
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 4868ec23a33..8f20f25dc19 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.107 2003/07/27 21:49:54 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.108 2003/07/28 00:09:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -396,7 +396,7 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir)
 			else if (strcasecmp(buf, "RecodeTable") == 0)
 				key = KEY_TABLE;
 			else
-				elog(LOG, "unknown tag %s in file %s",
+				elog(LOG, "unrecognized tag %s in file %s",
 					 buf, CHARSET_FILE);
 
 			switch (key)
@@ -452,7 +452,7 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir)
 			while (!feof(file) && buf[0])
 			{
 				next_token(file, buf, sizeof(buf));
-				elog(LOG, "unknown tag %s in file %s",
+				elog(LOG, "unrecognized tag %s in file %s",
 					 buf, CHARSET_FILE);
 			}
 		}
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ef6053f3286..d6d790095bd 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.140 2003/07/27 04:35:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.141 2003/07/28 00:09:16 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -910,7 +910,7 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"superuser_reserved_connections", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
-			gettext_noop("Number of 'connection slots' reserved for superusers"),
+			gettext_noop("Number of connection \"slots\" reserved for superusers"),
 			NULL
 		},
 		&ReservedBackends,
@@ -940,7 +940,7 @@ static struct config_int ConfigureNamesInt[] =
 			gettext_noop("Sets the access permissions of the Unix domain socket"),
 			gettext_noop("Unix domain sockets use the usual Unix file system "
 						 "permission set. The option value is expected to be an numeric mode "
-						 "specification in the form accepted by the chmod and umask  system "
+						 "specification in the form accepted by the chmod and umask system "
 						 "calls. (To use the customary octal format the number must start with "
 						 "a 0 (zero).)")
 		},
@@ -1085,7 +1085,7 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"checkpoint_warning", PGC_SIGHUP, WAL_CHECKPOINTS,
-			gettext_noop("Log if filling of checkpoint segments happens more"
+			gettext_noop("Log if filling of checkpoint segments happens more "
 						 "frequently than this (sec)"),
 			gettext_noop("Send a message to the server logs if checkpoints "
 						 "caused by the filling of checkpoint segment files happens more "
@@ -1312,7 +1312,7 @@ static struct config_string ConfigureNamesString[] =
 		{"default_transaction_isolation", PGC_USERSET, CLIENT_CONN_STATEMENT,
 			gettext_noop("The default isolation level of each new transaction"),
 			gettext_noop("Each SQL transaction has an isolation level, which "
-					 "can be either 'read committed' or 'serializable'.")
+					 "can be either \"read committed\" or \"serializable\".")
 		},
 		&default_iso_level_string,
 		"read committed", assign_defaultxactisolevel, NULL
@@ -1418,7 +1418,7 @@ static struct config_string ConfigureNamesString[] =
 
 	{
 		{"regex_flavor", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
-			gettext_noop("Regular expression 'flavor'"),
+			gettext_noop("Regular expression \"flavor\""),
 			gettext_noop("This can be set to advanced, extended, or basic")
 		},
 		&regex_flavor_string,
@@ -1471,7 +1471,7 @@ static struct config_string ConfigureNamesString[] =
 #ifdef HAVE_SYSLOG
 	{
 		{"syslog_facility", PGC_POSTMASTER, LOGGING_SYSLOG,
-			gettext_noop("Which syslog 'facility' to be used when syslog enabled"),
+			gettext_noop("syslog \"facility\" to be used when syslog enabled"),
 			gettext_noop("You may choose from LOCAL0, LOCAL1, LOCAL2, LOCAL3, "
 						 "LOCAL4, LOCAL5, LOCAL6, LOCAL7")
 		},
@@ -3983,7 +3983,7 @@ ProcessGUCArray(ArrayType *array, GucSource source)
 		{
 			ereport(WARNING,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("cannot parse setting for \"%s\"", name)));
+					 errmsg("could not parse setting for \"%s\"", name)));
 			free(name);
 			continue;
 		}