A visit from the message-style police ...

diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c
index 8ddce5c9211abca38a7e7b4587e692c41a4603fc..7c258f1305f445a2301bd22b6ffa20f3b4ba3885 100644 (file)
--- a/contrib/tsearch2/tsvector.c
+++ b/contrib/tsearch2/tsvector.c
@@ -762,7 +762,8 @@ tsearch2(PG_FUNCTION_ARGS)
    if (numidxattr == SPI_ERROR_NOATTRIBUTE)
        ereport(ERROR,
                (errcode(ERRCODE_UNDEFINED_COLUMN),
-                errmsg("cannot find tsvector_field")));
+                errmsg("tsvector column \"%s\" does not exist",
+                       trigger->tgargs[0])));
 
    prs.lenwords = 32;
    prs.curwords = 0;
@@ -785,7 +786,7 @@ tsearch2(PG_FUNCTION_ARGS)
            if ( funcoid==InvalidOid )
                ereport(ERROR,
                        (errcode(ERRCODE_UNDEFINED_COLUMN),
-                        errmsg("cannot find function or field \"%s\"",
+                        errmsg("could not find function or field \"%s\"",
                                trigger->tgargs[i])));
 
            continue;

diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 7ec20cc42098bec5e1c3f178fd6ead8edbdac7ea..4a42209dbc0827218004842bf8632788e0e086d9 100644 (file)
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.96 2003/07/21 20:29:38 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.97 2003/07/28 00:09:13 tgl Exp $
  *
  * NOTES
  *   some of the executor utility code such as "ExecTypeFromTL" should be
@@ -703,7 +703,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
    else if (functyptype == 'p' && typeoid == RECORDOID)
        ereport(ERROR,
                (errcode(ERRCODE_DATATYPE_MISMATCH),
-                errmsg("unable to determine tuple description for function returning record")));
+                errmsg("could not determine tuple description for function returning record")));
    else
    {
        /* crummy error message, but parser should have caught this */

diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 8a23b9b115cd5cb4f506c87a7a660360a27bd398..d3208e248e1536ab85d53ed639c830aef9b304ce 100644 (file)
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.44 2003/03/23 23:01:02 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.45 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -243,7 +243,8 @@ gistdropscan(IndexScanDesc s)
        prev = l;
 
    if (l == (GISTScanList) NULL)
-       elog(ERROR, "GiST scan list corrupted -- cannot find 0x%p", (void *) s);
+       elog(ERROR, "GiST scan list corrupted -- could not find 0x%p",
+            (void *) s);
 
    if (prev == (GISTScanList) NULL)
        GISTScans = l->gsl_next;

diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 334c309184f6babf624c344cad6a8b4484a21949..dd8eda99b9356866552ee5b80214a0e4ede8c8db 100644 (file)
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.101 2003/07/21 20:29:39 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.102 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1064,7 +1064,7 @@ _bt_findsplitloc(Relation rel,
     * just in case ...
     */
    if (!state.have_split)
-       elog(ERROR, "cannot find a feasible split point for \"%s\"",
+       elog(ERROR, "could not find a feasible split point for \"%s\"",
             RelationGetRelationName(rel));
 
    *newitemonleft = state.newitemonleft;

diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index f12c1896c07e8dc9ff51825cc180c82231c36be6..56367d2ab35ae270f5f91f622e20f098aa0c135f 100644 (file)
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.75 2003/07/21 20:29:39 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.76 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1015,7 +1015,7 @@ _bt_walk_left(Relation rel, Buffer buf)
             * if there's anything wrong.
             */
            if (opaque->btpo_prev == lblkno)
-               elog(ERROR, "cannot find left sibling in \"%s\"",
+               elog(ERROR, "could not find left sibling in \"%s\"",
                     RelationGetRelationName(rel));
            /* Okay to try again with new lblkno value */
        }

diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index d736e2f15ee5b00b19a294cf87126ab7fbb24f4f..a076b188ff099712752732fc024baf024d98235c 100644 (file)
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.52 2003/07/21 20:29:39 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.53 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -461,7 +461,7 @@ _bt_getstrategynumber(RegProcedure sk_procedure, StrategyMap map)
        if (sk_procedure == map->entry[j].sk_procedure)
            return j;
    }
-   elog(ERROR, "unable to identify operator %u", sk_procedure);
+   elog(ERROR, "could not identify operator %u", sk_procedure);
    return -1;                  /* keep compiler quiet */
 }
 

diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 345e66c676c4d282b97c2ac06fa2a0514b523531..6358d622e1ff729faccfdf713993da851b9de384 100644 (file)
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.44 2003/07/21 20:29:39 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.45 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -248,7 +248,8 @@ rtdropscan(IndexScanDesc s)
        prev = l;
 
    if (l == (RTScanList) NULL)
-       elog(ERROR, "rtree scan list corrupted -- cannot find 0x%p", (void *) s);
+       elog(ERROR, "rtree scan list corrupted -- could not find 0x%p",
+            (void *) s);
 
    if (prev == (RTScanList) NULL)
        RTScans = l->rtsl_next;

diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index 31d668b608cc4340104c6032d7fe7f8584f87564..5129dd3c7e52a0686e142ef10e32162803a5f919 100644 (file)
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.2 2003/07/19 21:37:37 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.3 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -811,7 +811,7 @@ restart:;
    {
        LWLockRelease(ctl->locks->ControlLock);
        ereport(LOG,
-               (errmsg("unable to truncate \"%s\": apparent wraparound",
+               (errmsg("could not truncate \"%s\": apparent wraparound",
                        ctl->Dir)));
        return;
    }

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 50fa1125bee2206fac11230f3df1d9ef4ccf6105..0ceb8951cbe0389b1681398e097324ad65d2b5b3 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.119 2003/07/21 20:29:39 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.120 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2642,7 +2642,7 @@ StartupXLOG(void)
        }
        else
            ereport(PANIC,
-                   (errmsg("unable to locate a valid checkpoint record")));
+                   (errmsg("could not locate a valid checkpoint record")));
    }
    LastRec = RecPtr = checkPointLoc;
    memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));

diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 93c0fdf51fec389518f1dc7036a811a809206638..2cdf4bc229cacc550b5b98563bd297dec8ebb461 100644 (file)
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.27 2003/07/21 01:59:07 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.28 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1725,7 +1725,7 @@ getObjectDescription(const ObjectAddress *object)
            }
 
        default:
-           appendStringInfo(&buffer, "unknown object %u %u %d",
+           appendStringInfo(&buffer, "unrecognized object %u %u %d",
                             object->classId,
                             object->objectId,
                             object->objectSubId);

diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
index 41d097d56b29d382dda3d337ca855e65e9f2043a..ccd419767d0d91205ec96f9495b64cb65fa7dff8 100644 (file)
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/catalog/pg_conversion.c,v 1.11 2003/07/21 01:59:10 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/catalog/pg_conversion.c,v 1.12 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -76,7 +76,7 @@ ConversionCreate(const char *conname, Oid connamespace,
                                  contoencoding))
            ereport(ERROR,
                    (errcode(ERRCODE_DUPLICATE_OBJECT),
-                    errmsg("default conversion for \"%s\" to \"%s\" already exists",
+                    errmsg("default conversion for %s to %s already exists",
                            pg_encoding_to_char(conforencoding),
                            pg_encoding_to_char(contoencoding))));
    }

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 24ad0bf41a26883f20a3d234b14e30e5971dc6a1..93701c2a59e45507f476c824b5e48c23363ed93a 100644 (file)
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.117 2003/07/18 23:20:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.118 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -334,12 +334,12 @@ createdb(const CreatedbStmt *stmt)
    if (mkdir(target_dir, S_IRWXU) != 0)
        ereport(ERROR,
                (errcode_for_file_access(),
-                errmsg("unable to create database directory \"%s\": %m",
+                errmsg("could not create database directory \"%s\": %m",
                        target_dir)));
    if (rmdir(target_dir) != 0)
        ereport(ERROR,
                (errcode_for_file_access(),
-                errmsg("unable to remove temp directory \"%s\": %m",
+                errmsg("could not remove temp directory \"%s\": %m",
                        target_dir)));
 
    /* Make the symlink, if needed */

diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index f351b0f2dcb4f3feaf9a6b29d8798d56b0e57b89..9f17eff84fa8a06e5c3e315bad95a0bcfe58a215 100644 (file)
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.29 2003/07/20 21:56:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.30 2003/07/28 00:09:14 tgl Exp $
  *
  * DESCRIPTION
  *   These routines take the parse tree and pick out the
@@ -106,12 +106,12 @@ compute_return_type(TypeName *returnType, Oid languageOid,
            languageOid != ClanguageId)
            ereport(ERROR,
                    (errcode(ERRCODE_UNDEFINED_OBJECT),
-                    errmsg("type %s does not exist", typnam)));
+                    errmsg("type \"%s\" does not exist", typnam)));
 
        /* Otherwise, go ahead and make a shell type */
        ereport(NOTICE,
                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                errmsg("type %s is not yet defined", typnam),
+                errmsg("type \"%s\" is not yet defined", typnam),
                 errdetail("Creating a shell type definition.")));
        namespaceId = QualifiedNameGetCreationNamespace(returnType->names,
                                                        &typname);
@@ -862,7 +862,7 @@ CreateCast(CreateCastStmt *stmt)
        if (procstruct->pronargs != 1)
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                    errmsg("cast function must take 1 argument")));
+                    errmsg("cast function must take one argument")));
        if (procstruct->proargtypes[0] != sourcetypeid)
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -962,7 +962,7 @@ CreateCast(CreateCastStmt *stmt)
    if (HeapTupleIsValid(tuple))
        ereport(ERROR,
                (errcode(ERRCODE_DUPLICATE_OBJECT),
-                errmsg("cast from data type %s to data type %s already exists",
+                errmsg("cast from type %s to type %s already exists",
                        TypeNameToString(stmt->sourcetype),
                        TypeNameToString(stmt->targettype))));
 

diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index 28807790d98f4156756479d5e320ebb26d2e95cc..ca2d9298945b5e14a3897f9110739c87e16633e9 100644 (file)
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.13 2003/07/20 21:56:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.14 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -278,10 +278,10 @@ DefineOpClass(CreateOpClassStmt *stmt)
            if (opclass->opcintype == typeoid && opclass->opcdefault)
                ereport(ERROR,
                        (errcode(ERRCODE_DUPLICATE_OBJECT),
-                        errmsg("cannot make class \"%s\" be default for type %s",
+                        errmsg("could not make class \"%s\" be default for type %s",
                                opcname,
                                TypeNameToString(stmt->datatype)),
-                        errdetail("class \"%s\" already is the default",
+                        errdetail("Class \"%s\" already is the default.",
                                   NameStr(opclass->opcname))));
        }
 

diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
index df82a4b26fa8b49f65653f091562e128320cad84..978f05ef928dd7118486d89e37699ce67c7fc988 100644 (file)
--- a/src/backend/commands/portalcmds.c
+++ b/src/backend/commands/portalcmds.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/portalcmds.c,v 1.17 2003/07/20 21:56:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/portalcmds.c,v 1.18 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -365,7 +365,7 @@ PersistHoldablePortal(Portal portal)
        if (portal->posOverflow)        /* oops, cannot trust portalPos */
            ereport(ERROR,
                    (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                    errmsg("unable to reposition held cursor")));
+                    errmsg("could not reposition held cursor")));
 
        tuplestore_rescan(portal->holdStore);
 

diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index ae6c45019ad4ebe2d4fbbb1338e44b77838e724b..cd58d7fc7b6867e406cceb9f33fa624768e2c1fb 100644 (file)
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -10,7 +10,7 @@
  * Copyright (c) 2002-2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/prepare.c,v 1.20 2003/07/20 21:56:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/prepare.c,v 1.21 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -264,7 +264,7 @@ InitQueryHashTable(void)
                                   HASH_ELEM);
 
    if (!prepared_queries)
-       elog(ERROR, "unable to create hash table");
+       elog(ERROR, "could not create hash table");
 }
 
 /*
@@ -336,7 +336,7 @@ StorePreparedStatement(const char *stmt_name,
 
    /* Shouldn't get a failure, nor a duplicate entry */
    if (!entry || found)
-       elog(ERROR, "unable to store prepared statement \"%s\"",
+       elog(ERROR, "could not store prepared statement \"%s\"",
             stmt_name);
 
    /* Fill in the hash table entry with copied data */

diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 8d50f0d69c095ec718043113b0a009a4085274c5..808401c48f2586dc0780594d50e5b4c15250d7ee 100644 (file)
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/schemacmds.c,v 1.12 2003/07/18 23:20:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/schemacmds.c,v 1.13 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -97,7 +97,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
        ereport(ERROR,
                (errcode(ERRCODE_RESERVED_NAME),
                 errmsg("unacceptable schema name \"%s\"", schemaName),
-                errdetail("The prefix pg_ is reserved for system schemas.")));
+                errdetail("The prefix \"pg_\" is reserved for system schemas.")));
 
    /* Create the schema's namespace */
    namespaceId = NamespaceCreate(schemaName, owner_userid);
@@ -214,7 +214,7 @@ RemoveSchemaById(Oid schemaOid)
                         ObjectIdGetDatum(schemaOid),
                         0, 0, 0);
    if (!HeapTupleIsValid(tup)) /* should not happen */
-       elog(ERROR, "cache lookup failed for schema %u", schemaOid);
+       elog(ERROR, "cache lookup failed for namespace %u", schemaOid);
 
    simple_heap_delete(relation, &tup->t_self);
 
@@ -266,7 +266,7 @@ RenameSchema(const char *oldname, const char *newname)
        ereport(ERROR,
                (errcode(ERRCODE_RESERVED_NAME),
                 errmsg("unacceptable schema name \"%s\"", newname),
-                errdetail("The prefix pg_ is reserved for system schemas.")));
+                errdetail("The prefix \"pg_\" is reserved for system schemas.")));
 
    /* rename */
    namestrcpy(&(((Form_pg_namespace) GETSTRUCT(tup))->nspname), newname);

diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index fd30a33b8865b6bbaeaab70efc2edd6d5ea208c5..cb2106a360303c56da49ae3e6b721b5adf8ec7e7 100644 (file)
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.97 2003/07/20 21:56:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.98 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -856,8 +856,8 @@ read_info(SeqTable elm, Relation rel, Buffer *buf)
    sm = (sequence_magic *) PageGetSpecialPointer(page);
 
    if (sm->magic != SEQ_MAGIC)
-       elog(ERROR, "bad magic number (%08X) in sequence \"%s\"",
-            sm->magic, RelationGetRelationName(rel));
+       elog(ERROR, "bad magic number in sequence \"%s\": %08X",
+            RelationGetRelationName(rel), sm->magic);
 
    lp = PageGetItemId(page, FirstOffsetNumber);
    Assert(ItemIdIsUsed(lp));
@@ -954,7 +954,7 @@ init_params(List *options, Form_pg_sequence new)
        if (new->increment_by == 0)
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                    errmsg("can't INCREMENT by zero")));
+                    errmsg("cannot increment by zero")));
    }
 
    /* MAXVALUE */

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index ca594f635708dfdbf313b4ffecb9ea8eb69339c2..9cfa852aa8327b670bd57e0e66a6b1b02d2ed4f3 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.151 2003/07/20 21:56:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.152 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -133,7 +133,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint)
        if (needconstrrelid && constrrelid == InvalidOid)
            ereport(NOTICE,
                    (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                    errmsg("unable to determine referenced table for constraint \"%s\"",
+                    errmsg("could not determine referenced table for constraint \"%s\"",
                            stmt->trigname)));
    }
 
@@ -233,7 +233,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint)
                TRIGGER_SETT_UPDATE(tgtype);
                break;
            default:
-               elog(ERROR, "unknown trigger event: %d",
+               elog(ERROR, "unrecognized trigger event: %d",
                     (int) stmt->actions[i]);
                break;
        }
@@ -477,7 +477,7 @@ DropTrigger(Oid relid, const char *trigname, DropBehavior behavior)
    if (!HeapTupleIsValid(tup))
        ereport(ERROR,
                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                errmsg("trigger \"%s\" on relation \"%s\" does not exist",
+                errmsg("trigger \"%s\" for relation \"%s\" does not exist",
                        trigname, get_rel_name(relid))));
 
    if (!pg_class_ownercheck(relid, GetUserId()))
@@ -1574,7 +1574,7 @@ ltrmark:;
                if (XactIsoLevel == XACT_SERIALIZABLE)
                    ereport(ERROR,
                            (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-                            errmsg("cannot serialize access due to concurrent update")));
+                            errmsg("could not serialize access due to concurrent update")));
                else if (!(ItemPointerEquals(&(tuple.t_self), tid)))
                {
                    TupleTableSlot *epqslot = EvalPlanQual(estate,
@@ -1597,7 +1597,7 @@ ltrmark:;
 
            default:
                ReleaseBuffer(buffer);
-               elog(ERROR, "unrecognized status %u from heap_mark4update",
+               elog(ERROR, "unrecognized heap_mark4update status: %u",
                     test);
                return NULL;    /* keep compiler quiet */
        }

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index d23c21800612844113753face61c7f62f215cd15..7f85f0581b6b5a3ef4958c5f622f0afb0eb84030 100644 (file)
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.120 2003/07/20 21:56:34 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/user.c,v 1.121 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -146,7 +146,7 @@ write_group_file(Relation grel)
    if (fp == NULL)
        ereport(ERROR,
                (errcode_for_file_access(),
-                errmsg("unable to write temp file \"%s\": %m", tempname)));
+                errmsg("could not write temp file \"%s\": %m", tempname)));
 
    /*
     * Read pg_group and write the file.  Note we use SnapshotSelf to ensure
@@ -245,7 +245,7 @@ write_group_file(Relation grel)
    if (ferror(fp))
        ereport(ERROR,
                (errcode_for_file_access(),
-                errmsg("unable to write temp file \"%s\": %m", tempname)));
+                errmsg("could not write temp file \"%s\": %m", tempname)));
    FreeFile(fp);
 
    /*
@@ -294,7 +294,7 @@ write_user_file(Relation urel)
    if (fp == NULL)
        ereport(ERROR,
                (errcode_for_file_access(),
-                errmsg("unable to write temp file \"%s\": %m", tempname)));
+                errmsg("could not write temp file \"%s\": %m", tempname)));
 
    /*
     * Read pg_shadow and write the file.  Note we use SnapshotSelf to ensure
@@ -376,7 +376,7 @@ write_user_file(Relation urel)
    if (ferror(fp))
        ereport(ERROR,
                (errcode_for_file_access(),
-                errmsg("unable to write temp file \"%s\": %m", tempname)));
+                errmsg("could not write temp file \"%s\": %m", tempname)));
    FreeFile(fp);
 
    /*

diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 611c493c14f44f9629f70cca07b959c5d66a48e6..a9fc94adc3d2145fd598f4252ff04c70ea27bf2a 100644 (file)
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.83 2003/07/20 21:56:34 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/variable.c,v 1.84 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -242,7 +242,7 @@ set_tz(const char *tz)
    strcpy(tzbuf, "TZ=");
    strncpy(tzbuf + 3, tz, sizeof(tzbuf) - 4);
    if (putenv(tzbuf) != 0)     /* shouldn't happen? */
-       elog(LOG, "unable to set TZ environment variable");
+       elog(LOG, "could not set TZ environment variable");
    tzset();
 }
 
@@ -268,7 +268,7 @@ clear_tz(void)
    {
        strcpy(tzbuf, "=");
        if (putenv(tzbuf) != 0)
-           elog(LOG, "unable to clear TZ environment variable");
+           elog(LOG, "could not clear TZ environment variable");
        tzset();
    }
 }
@@ -695,7 +695,7 @@ assign_client_encoding(const char *value, bool doit, bool interactive)
        if (interactive)
            ereport(ERROR,
                    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                    errmsg("conversion between \"%s\" and \"%s\" is not supported",
+                    errmsg("conversion between %s and %s is not supported",
                            value, GetDatabaseEncodingName())));
        return NULL;
    }

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 7f6c8253807928e739082d082e310c01eda8d8dd..7a0ba7d296076dfff43488cfde4c0e5eb0d2c885 100644 (file)
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.210 2003/07/21 17:05:08 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.211 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1117,7 +1117,7 @@ lnext:    ;
                            if (XactIsoLevel == XACT_SERIALIZABLE)
                                ereport(ERROR,
                                        (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-                                        errmsg("cannot serialize access due to concurrent update")));
+                                        errmsg("could not serialize access due to concurrent update")));
                            if (!(ItemPointerEquals(&(tuple.t_self),
                                  (ItemPointer) DatumGetPointer(datum))))
                            {
@@ -1416,7 +1416,7 @@ ldelete:;
            if (XactIsoLevel == XACT_SERIALIZABLE)
                ereport(ERROR,
                        (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-                        errmsg("cannot serialize access due to concurrent update")));
+                        errmsg("could not serialize access due to concurrent update")));
            else if (!(ItemPointerEquals(tupleid, &ctid)))
            {
                TupleTableSlot *epqslot = EvalPlanQual(estate,
@@ -1550,7 +1550,7 @@ lreplace:;
            if (XactIsoLevel == XACT_SERIALIZABLE)
                ereport(ERROR,
                        (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-                        errmsg("cannot serialize access due to concurrent update")));
+                        errmsg("could not serialize access due to concurrent update")));
            else if (!(ItemPointerEquals(tupleid, &ctid)))
            {
                TupleTableSlot *epqslot = EvalPlanQual(estate,
@@ -1737,7 +1737,7 @@ EvalPlanQual(EState *estate, Index rti, ItemPointer tid)
            }
        }
        if (relation == NULL)
-           elog(ERROR, "cannot find RowMark for RT index %u", rti);
+           elog(ERROR, "could not find RowMark for RT index %u", rti);
    }
 
    /*

diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index dad12acb78375f4221bdcf7bc2a195df0813ad57..c65844b0f897bf77cb203a36b898a40dac32b7d9 100644 (file)
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.135 2003/07/21 17:05:08 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.136 2003/07/28 00:09:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -533,7 +533,7 @@ GetAttributeByNum(TupleTableSlot *slot,
    Datum       retval;
 
    if (!AttributeNumberIsValid(attrno))
-       elog(ERROR, "invalid attribute number: %d", attrno);
+       elog(ERROR, "invalid attribute number %d", attrno);
 
    if (isNull == (bool *) NULL)
        elog(ERROR, "a NULL isNull pointer was passed");
@@ -616,7 +616,7 @@ init_fcache(Oid foid, FuncExprState *fcache, MemoryContext fcacheCxt)
 
    /* Safety check (should never fail, as parser should check sooner) */
    if (length(fcache->args) > FUNC_MAX_ARGS)
-       elog(ERROR, "too many arguments to function");
+       elog(ERROR, "too many arguments");
 
    /* Set up the primary fmgr lookup information */
    fmgr_info_cxt(foid, &(fcache->func), fcacheCxt);

diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c
index 7917744dd932fc1a1bcf0125c2dee6ce38364f50..bae8f0116bc94aef9885e31c6f60b6734688c429 100644 (file)
--- a/src/backend/executor/nodeSetOp.c
+++ b/src/backend/executor/nodeSetOp.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/executor/nodeSetOp.c,v 1.10 2003/07/21 17:05:10 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/executor/nodeSetOp.c,v 1.11 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -170,7 +170,7 @@ ExecSetOp(SetOpState *node)
                        0 : (node->numLeft - node->numRight);
                    break;
                default:
-                   elog(ERROR, "unrecognized setop code: %d",
+                   elog(ERROR, "unrecognized set op: %d",
                         (int) plannode->cmd);
                    break;
            }

diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index bdfac16f7c1f8916494000b2ad04ea65428db8c7..00bd01b6aef73fee49d48392e73a1dda7a220825 100644 (file)
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.65 2003/07/22 19:00:10 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.66 2003/07/28 00:09:15 tgl Exp $
  *
  * NOTES
  *   This should be moved to a more appropriate place.  It is here
@@ -99,7 +99,7 @@ lo_open(PG_FUNCTION_ARGS)
    {                           /* lookup failed */
        MemoryContextSwitchTo(currentContext);
 #if FSDB
-       elog(DEBUG4, "cannot open large object %u", lobjId);
+       elog(DEBUG4, "could not open large object %u", lobjId);
 #endif
        PG_RETURN_INT32(-1);
    }

diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index e47a3f7945682656cd0282abc33b8bdb3bb3ff20..513c17b048c9dc9cb833f5491440fd9e37e40448 100644 (file)
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -18,7 +18,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.203 2003/07/22 23:30:37 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.204 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -189,7 +189,7 @@ _equalParam(Param *a, Param *b)
            COMPARE_SCALAR_FIELD(paramid);
            break;
        default:
-           elog(ERROR, "unrecognized paramkind value: %d",
+           elog(ERROR, "unrecognized paramkind: %d",
                 a->paramkind);
    }
 

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 3501bf17750944896f09848d582734850c96d3fd..fba5955379359a2334e8836fe3f987fd67e1504b 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.213 2003/07/22 23:30:37 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.214 2003/07/28 00:09:15 tgl Exp $
  *
  * NOTES
  *   Every node type that can appear in stored rules' parsetrees *must*
@@ -1322,7 +1322,7 @@ _outRangeTblEntry(StringInfo str, RangeTblEntry *node)
            WRITE_NODE_FIELD(joinaliasvars);
            break;
        default:
-           elog(ERROR, "unrecognized rte kind: %d", (int) node->rtekind);
+           elog(ERROR, "unrecognized RTE kind: %d", (int) node->rtekind);
            break;
    }
 

diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 02f6e0c4c500838c77162f6e2c5e767f837e19af..afcb4528326b6912073d31732b45fbc858a265fd 100644 (file)
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.87 2003/07/25 00:01:07 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.88 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -752,7 +752,7 @@ process_implied_equality(Query *root,
         */
        ereport(ERROR,
                (errcode(ERRCODE_UNDEFINED_FUNCTION),
-                errmsg("unable to identify an equality operator for types %s and %s",
+                errmsg("could not identify an equality operator for types %s and %s",
                        format_type_be(ltype), format_type_be(rtype))));
    }
    pgopform = (Form_pg_operator) GETSTRUCT(eq_operator);

diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 065f5d9ccacf6639bf9d6d6aaf781023a716afa2..5422d5917289dd0bdb38f56fc37bc736c1a007b9 100644 (file)
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.100 2003/07/25 00:01:08 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.101 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -312,7 +312,7 @@ generate_nonunion_plan(SetOperationStmt *op, Query *parse,
            cmd = op->all ? SETOPCMD_EXCEPT_ALL : SETOPCMD_EXCEPT;
            break;
        default:
-           elog(ERROR, "unrecognized set operation code: %d",
+           elog(ERROR, "unrecognized set op: %d",
                 (int) op->op);
            cmd = SETOPCMD_INTERSECT;   /* keep compiler quiet */
            break;

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index db8b7cc968dad089848005e977f445a06af3ab4e..1ba1bf514619a09d25bfebe16bfb2d66baf9be78 100644 (file)
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.281 2003/07/19 20:20:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.282 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1151,7 +1151,7 @@ transformTableConstraint(ParseState *pstate, CreateStmtContext *cxt,
        case CONSTR_ATTR_NOT_DEFERRABLE:
        case CONSTR_ATTR_DEFERRED:
        case CONSTR_ATTR_IMMEDIATE:
-           elog(ERROR, "illegal context for constraint type %d",
+           elog(ERROR, "invalid context for constraint type %d",
                 constraint->contype);
            break;
 
@@ -2756,11 +2756,11 @@ transformExecuteStmt(ParseState *pstate, ExecuteStmt *stmt)
            if (pstate->p_hasSubLinks)
                ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot use sub-selects in EXECUTE parameters")));
+                        errmsg("cannot use sub-select in EXECUTE parameter")));
            if (pstate->p_hasAggs)
                ereport(ERROR,
                        (errcode(ERRCODE_GROUPING_ERROR),
-                        errmsg("cannot use aggregates in EXECUTE parameters")));
+                        errmsg("cannot use aggregate in EXECUTE parameter")));
 
            given_type_id = exprType(expr);
            expected_type_id = lfirsto(paramtypes);

diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 680802df592d048d15faeb7cde03b5d613cc9b94..351bc00c70f584fb1db2874f1600ea9b96153d52 100644 (file)
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.105 2003/07/19 20:20:52 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.106 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -726,7 +726,7 @@ coerce_to_common_type(ParseState *pstate, Node *node,
        ereport(ERROR,
                (errcode(ERRCODE_CANNOT_COERCE),
                 /* translator: first %s is name of a SQL construct, eg CASE */
-                errmsg("%s unable to convert type %s to %s",
+                errmsg("%s could not convert type %s to %s",
                        context,
                        format_type_be(inputTypeId),
                        format_type_be(targetTypeId))));
@@ -945,7 +945,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
        /* Only way to get here is if all the generic args are UNKNOWN */
        ereport(ERROR,
                (errcode(ERRCODE_DATATYPE_MISMATCH),
-                errmsg("cannot determine ANYARRAY/ANYELEMENT type because input is UNKNOWN")));
+                errmsg("could not determine ANYARRAY/ANYELEMENT type because input is UNKNOWN")));
    }
 
    /*
@@ -972,7 +972,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
                    if (!OidIsValid(array_typeid))
                        ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                errmsg("cannot find array type for datatype %s",
+                                errmsg("could not find array type for datatype %s",
                                        format_type_be(elem_typeid))));
                }
                declared_arg_types[j] = array_typeid;
@@ -989,7 +989,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
            if (!OidIsValid(array_typeid))
                ereport(ERROR,
                        (errcode(ERRCODE_UNDEFINED_OBJECT),
-                        errmsg("cannot find array type for datatype %s",
+                        errmsg("could not find array type for datatype %s",
                                format_type_be(elem_typeid))));
        }
        return array_typeid;
@@ -1043,7 +1043,7 @@ resolve_generic_type(Oid declared_type,
            if (!OidIsValid(array_typeid))
                ereport(ERROR,
                        (errcode(ERRCODE_UNDEFINED_OBJECT),
-                        errmsg("cannot find array type for datatype %s",
+                        errmsg("could not find array type for datatype %s",
                                format_type_be(context_actual_type))));
            return array_typeid;
        }
@@ -1075,7 +1075,7 @@ resolve_generic_type(Oid declared_type,
    }
    /* If we get here, declared_type is polymorphic and context isn't */
    /* NB: this is a calling-code logic error, not a user error */
-   elog(ERROR, "cannot determine ANYARRAY/ANYELEMENT type because context isn't polymorphic");
+   elog(ERROR, "could not determine ANYARRAY/ANYELEMENT type because context isn't polymorphic");
    return InvalidOid;          /* keep compiler quiet */
 }
 

diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index aad725fdd61c85414d3cfed94cc77c24aba46fc9..eb24c1b615e762ecbc67362070a3a7ce6893947e 100644 (file)
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.157 2003/07/19 20:20:52 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.158 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -785,7 +785,7 @@ transformExpr(ParseState *pstate, Node *expr)
                    if (!OidIsValid(element_type))
                        ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                errmsg("cannot find array type for datatype %s",
+                                errmsg("could not find array type for datatype %s",
                                        format_type_be(array_type))));
 
                    /*
@@ -1252,7 +1252,7 @@ exprType(Node *expr)
                        if (!OidIsValid(type))
                            ereport(ERROR,
                                    (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                    errmsg("cannot find array type for datatype %s",
+                                    errmsg("could not find array type for datatype %s",
                                            format_type_be(tent->resdom->restype))));
                    }
                }
@@ -1289,7 +1289,7 @@ exprType(Node *expr)
                        if (!OidIsValid(type))
                            ereport(ERROR,
                                    (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                    errmsg("cannot find array type for datatype %s",
+                                    errmsg("could not find array type for datatype %s",
                                            format_type_be(tent->resdom->restype))));
                    }
                }

diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index b2ae0cc9271904340cac3d5abcd5ecff4144e167..40197394501c8c7289d4615972674b9307b69fd1 100644 (file)
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.156 2003/07/20 21:56:34 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.157 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -311,7 +311,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
                     errmsg("function %s is not unique",
                            func_signature_string(funcname, nargs,
                                                  actual_arg_types)),
-                    errhint("Unable to choose a best candidate function. "
+                    errhint("Could not choose a best candidate function. "
                             "You may need to add explicit typecasts.")));
        else
            ereport(ERROR,

diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 8ecc11a66185499903cb331a5dd8434eda8f3f19..68225aae0a3a7097ccb3fbd3bb9100e9c71dd211 100644 (file)
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.70 2003/07/18 23:20:32 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.71 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -184,7 +184,7 @@ equality_oper(Oid argtype, bool noError)
    if (!noError)
        ereport(ERROR,
                (errcode(ERRCODE_UNDEFINED_FUNCTION),
-                errmsg("unable to identify an equality operator for type %s",
+                errmsg("could not identify an equality operator for type %s",
                        format_type_be(argtype))));
    return NULL;
 }
@@ -247,7 +247,7 @@ ordering_oper(Oid argtype, bool noError)
    if (!noError)
        ereport(ERROR,
                (errcode(ERRCODE_UNDEFINED_FUNCTION),
-                errmsg("unable to identify an ordering operator for type %s",
+                errmsg("could not identify an ordering operator for type %s",
                        format_type_be(argtype)),
                 errhint("Use an explicit ordering operator or modify the query.")));
    return NULL;
@@ -689,7 +689,7 @@ op_error(List *op, char oprkind, Oid arg1, Oid arg2, FuncDetailCode fdresult)
                (errcode(ERRCODE_AMBIGUOUS_FUNCTION),
                 errmsg("operator is not unique: %s",
                        op_signature_string(op, oprkind, arg1, arg2)),
-                errhint("Unable to choose a best candidate operator. "
+                errhint("Could not choose a best candidate operator. "
                         "You may need to add explicit typecasts.")));
    else
        ereport(ERROR,
@@ -828,7 +828,7 @@ make_scalar_array_op(ParseState *pstate, List *opname,
    if (!OidIsValid(res_atypeId))
        ereport(ERROR,
                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                errmsg("unable to find datatype for array of %s",
+                errmsg("could not find datatype for array of %s",
                        format_type_be(declared_arg_types[1]))));
    actual_arg_types[1] = atypeId;
    declared_arg_types[1] = res_atypeId;

diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 92b7c02394ab1b73b952af42d0b4c3bfcaa61ac3..daeb56b11012f7a9ee02bc4f6a1a40776820ca29 100644 (file)
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.107 2003/07/19 20:20:52 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.108 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -496,7 +496,7 @@ checkInsertTargets(ParseState *pstate, List *cols, List **attrnos)
            if (intMember(attrno, *attrnos))
                ereport(ERROR,
                        (errcode(ERRCODE_DUPLICATE_COLUMN),
-                        errmsg("attribute \"%s\" specified more than once in INSERT list",
+                        errmsg("attribute \"%s\" specified more than once",
                                name)));
            *attrnos = lappendi(*attrnos, attrno);
        }

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index f8882737eeed5f611f2ada4df0f39d183c32c1a2..4c8dbe5e163f3dc5c3fea8f88fdd1f5a72db216b 100644 (file)
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -13,7 +13,7 @@
  *
  * Copyright (c) 2001-2003, PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.40 2003/07/23 23:30:40 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.41 2003/07/28 00:09:15 tgl Exp $
  * ----------
  */
 #include "postgres.h"
@@ -2022,7 +2022,7 @@ pgstat_write_statsfile(void)
    {
        ereport(LOG,
                (errcode_for_file_access(),
-                errmsg("cannot write temp statistics file \"%s\": %m",
+                errmsg("could not write temp statistics file \"%s\": %m",
                        pgStat_tmpfname)));
        return;
    }

diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index e5ddc930b8890f7644f1f532cf252fc83e778d63..2e71f40c09b5fdb2f4c5a1f354437f773068dfe3 100644 (file)
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.123 2003/07/24 22:04:14 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.124 2003/07/28 00:09:15 tgl Exp $
  *
  * NOTES
  *   Outside modules can create a lock table and acquire/release
@@ -1197,7 +1197,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PGPROC *proc,
    lockMethodTable = LockMethodTable[lockmethod];
    if (!lockMethodTable)
    {
-       elog(WARNING, "bad lockmethod %d", lockmethod);
+       elog(WARNING, "bad lock method: %d", lockmethod);
        return FALSE;
    }
 

diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 739b4a8b48c9bede67888ba7ebcd91aa273890df..bd46d3dbd52f880486ffa752fb6b920abf124d3f 100644 (file)
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.95 2003/07/24 22:04:15 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.96 2003/07/28 00:09:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -608,7 +608,7 @@ mdnblocks(Relation reln)
             */
            v->mdfd_chain = _mdfd_openseg(reln, segno, O_CREAT);
            if (v->mdfd_chain == (MdfdVec *) NULL)
-               elog(ERROR, "could not count blocks for \"%s\": %m",
+               elog(ERROR, "could not count blocks of \"%s\": %m",
                     RelationGetRelationName(reln));
        }
 

diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 4c9990194ea71ae77407ec4133b02852bd1c0c34..4f1234e35a0cc04c484746853aaf2b3572c0bbce 100644 (file)
--- 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 480c334b15b655fa8e55c8ec6a6f7ac7a088800c..78b132c5167cbc78546c72dc34149c23e79e0194 100644 (file)
--- 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 fb9d5a2e458a460b802af2bcec7d89ce933e35ea..584e3e5ae820bcc62aa4c97a0ddb0bb8938b9c2b 100644 (file)
--- 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 2ebc0a949ba402d2ba0f51d2cb8f8e36968eb337..a1e55ee71f55362b71367206b7547321c8b84688 100644 (file)
--- 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 e2a5a02af7902ac8c64de4de23e7687ef11f7876..86bb40e738a7b36b6d7f2b2e7fc7b3e8ec2449e4 100644 (file)
--- 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 d39791d39a1658217af539d1d939a4b213d3fb23..fcadcdbd8ffff822ab6e53e4d16f983fe684fdf7 100644 (file)
--- 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 4868ec23a33e7c1a4544f1c2d57d1f6102811736..8f20f25dc19dff4b467a4d6ef28863a212224c44 100644 (file)
--- 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 ef6053f3286ec4ee204f79576f4a9e6925300d57..d6d790095bd7451a5eb1e6a79aa3b50f4099af44 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut .
  *
  * 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")
        },
        ®ex_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;
        }

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index d29ddc32bc95775906e7f63b14bbd5f4a582a500..2ebe6d0396b81b66dfc7680b32e63ba6b327cd7d 100755 (executable)
--- a/src/bin/pg_ctl/pg_ctl.sh
+++ b/src/bin/pg_ctl/pg_ctl.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.33 2003/07/23 08:47:30 petere Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.34 2003/07/28 00:09:16 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -303,7 +303,7 @@ if [ "$op" = "stop" -o "$op" = "restart" -o "$op" = "reload" ];then
    fi
 
     else # ! -f $PIDFILE
-   echo "$CMDNAME: cannot find $PIDFILE" 1>&2
+   echo "$CMDNAME: could not find $PIDFILE" 1>&2
    echo "Is postmaster running?" 1>&2
    if [ "$op" = "restart" ];then
        echo "starting postmaster anyway" 1>&2

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 0c38d4a8ef3ac95e6252c2a139c2b36cb69cacc5..e58c316866d8b347a86704ed50c9dc1c5e1049d0 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -12,7 +12,7 @@
  * by PostgreSQL
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.339 2003/07/27 03:47:22 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.340 2003/07/28 00:09:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -4382,7 +4382,7 @@ convertOperatorReference(const char *opr,
 
    name = findOprByOid(g_oprinfo, numOperators, opr);
    if (name == NULL)
-       write_msg(NULL, "WARNING: cannot find operator with OID %s\n",
+       write_msg(NULL, "WARNING: could not find operator with OID %s\n",
                  opr);
    return name;
 }

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index af526a8f0419bde88c5574bbe769a3f507e36cd0..5c3e8716b18b8f3760591389f5b4a6cde1b0fb50 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.255 2003/07/27 03:32:26 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.256 2003/07/28 00:09:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -448,7 +448,7 @@ connectOptions2(PGconn *conn)
        {
            conn->status = CONNECTION_BAD;
            printfPQExpBuffer(&conn->errorMessage,
-                             libpq_gettext("unknown sslmode \"%s\" requested\n"),
+                             libpq_gettext("unrecognized sslmode: \"%s\"\n"),
                              conn->sslmode);
            return false;
        }

diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index 632dd36e8158837bb7527493af5907a9f20cb362..2d5e92b1e2d8d0634c4e67894867788b7276b201 100644 (file)
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -3,7 +3,7 @@
  *           procedural language
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.27 2003/07/25 23:37:29 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.28 2003/07/28 00:09:16 tgl Exp $
  *
  *   This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -593,7 +593,7 @@ dump_stmt(PLpgSQL_stmt * stmt)
            dump_perform((PLpgSQL_stmt_perform *) stmt);
            break;
        default:
-           elog(ERROR, "unknown cmd_type: %d", stmt->cmd_type);
+           elog(ERROR, "unrecognized cmd_type: %d", stmt->cmd_type);
            break;
    }
 }

diff --git a/src/port/strerror.c b/src/port/strerror.c
index b878388ea25193fa7650e6bdac88d01a88bd8664..daa97a803a9e6bb4dce2dae59a2b4df48af5aacf 100644 (file)
--- a/src/port/strerror.c
+++ b/src/port/strerror.c
@@ -1,4 +1,4 @@
-/* $Id: strerror.c,v 1.1 2002/07/18 04:13:59 momjian Exp $ */
+/* $Id: strerror.c,v 1.2 2003/07/28 00:09:16 tgl Exp $ */
 
 /*
  * strerror - map error number to descriptive string
@@ -23,7 +23,7 @@ strerror(int errnum)
 
    if (errnum < 0 || errnum > sys_nerr)
    {
-       sprintf(buf, "unknown error %d", errnum);
+       sprintf(buf, "unrecognized error %d", errnum);
        return buf;
    }
 

diff --git a/src/test/regress/expected/conversion.out b/src/test/regress/expected/conversion.out
index 622fccaacd2b5c092b4b434ba90e2b0c39a09de1..289bd0a27f10bf15ed8ffa9108b536717396652a 100644 (file)
--- a/src/test/regress/expected/conversion.out
+++ b/src/test/regress/expected/conversion.out
@@ -17,7 +17,7 @@ CREATE DEFAULT CONVERSION public.mydef FOR 'LATIN1' TO 'UNICODE' FROM iso8859_1_
 -- cannot make default conversion with same shcema/for_encoding/to_encoding
 --
 CREATE DEFAULT CONVERSION public.mydef2 FOR 'LATIN1' TO 'UNICODE' FROM iso8859_1_to_utf8;
-ERROR:  default conversion for "LATIN1" to "UNICODE" already exists
+ERROR:  default conversion for LATIN1 to UNICODE already exists
 --
 -- drop user defined conversion
 --

diff --git a/src/test/regress/expected/create_type.out b/src/test/regress/expected/create_type.out
index 64c29890fddced6484e82b296e633ced7f9215dd..210da92cf2df9b7f3663cc7e14812366d04fa25f 100644 (file)
--- a/src/test/regress/expected/create_type.out
+++ b/src/test/regress/expected/create_type.out
@@ -19,7 +19,7 @@ CREATE FUNCTION int42_in(cstring)
    RETURNS int42
    AS 'int4in'
    LANGUAGE 'internal' WITH (isStrict);
-NOTICE:  type int42 is not yet defined
+NOTICE:  type "int42" is not yet defined
 DETAIL:  Creating a shell type definition.
 CREATE FUNCTION int42_out(int42)
    RETURNS cstring
@@ -30,7 +30,7 @@ CREATE FUNCTION text_w_default_in(cstring)
    RETURNS text_w_default
    AS 'textin'
    LANGUAGE 'internal' WITH (isStrict);
-NOTICE:  type text_w_default is not yet defined
+NOTICE:  type "text_w_default" is not yet defined
 DETAIL:  Creating a shell type definition.
 CREATE FUNCTION text_w_default_out(text_w_default)
    RETURNS cstring

diff --git a/src/test/regress/expected/time.out b/src/test/regress/expected/time.out
index 5604c9a452d7e34b8ebf8272eda137c0f00c1bcf..5cf09b1ae211029a0748f55b370e669f63728bf2 100644 (file)
--- a/src/test/regress/expected/time.out
+++ b/src/test/regress/expected/time.out
@@ -70,4 +70,4 @@ SELECT f1 AS "Eight" FROM TIME_TBL WHERE f1 >= '00:00';
 -- where we do mixed-type arithmetic. - thomas 2000-12-02
 SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
 ERROR:  operator is not unique: time without time zone + time without time zone
-HINT:  Unable to choose a best candidate operator. You may need to add explicit typecasts.
+HINT:  Could not choose a best candidate operator. You may need to add explicit typecasts.

diff --git a/src/test/regress/output/create_function_1.source b/src/test/regress/output/create_function_1.source
index 777948530599534ad09a4f83d2324546ad29e5df..44e74fb527e9241c82c2298dc98c980e56ec181e 100644 (file)
--- a/src/test/regress/output/create_function_1.source
+++ b/src/test/regress/output/create_function_1.source
@@ -5,7 +5,7 @@ CREATE FUNCTION widget_in(cstring)
    RETURNS widget
    AS '@abs_builddir@/regress@DLSUFFIX@'
    LANGUAGE 'c';
-NOTICE:  type widget is not yet defined
+NOTICE:  type "widget" is not yet defined
 DETAIL:  Creating a shell type definition.
 CREATE FUNCTION widget_out(widget)
    RETURNS cstring
@@ -16,7 +16,7 @@ CREATE FUNCTION int44in(cstring)
    RETURNS city_budget
    AS '@abs_builddir@/regress@DLSUFFIX@'
    LANGUAGE 'c';
-NOTICE:  type city_budget is not yet defined
+NOTICE:  type "city_budget" is not yet defined
 DETAIL:  Creating a shell type definition.
 CREATE FUNCTION int44out(city_budget)
    RETURNS cstring