Skip to content

Commit 81b5c8a

Browse files
tglsfdctglsfdc
committed
A visit from the message-style police ...
1 parent b556e82 commit 81b5c8a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+161
-158
lines changed

‎contrib/tsearch2/tsvector.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,8 @@ tsearch2(PG_FUNCTION_ARGS)
762762
if (numidxattr == SPI_ERROR_NOATTRIBUTE)
763763
ereport(ERROR,
764764
(errcode(ERRCODE_UNDEFINED_COLUMN),
765-
errmsg("cannot find tsvector_field")));
765+
errmsg("tsvector column \"%s\" does not exist",
766+
trigger->tgargs[0])));
766767

767768
prs.lenwords = 32;
768769
prs.curwords = 0;
@@ -785,7 +786,7 @@ tsearch2(PG_FUNCTION_ARGS)
785786
if ( funcoid==InvalidOid )
786787
ereport(ERROR,
787788
(errcode(ERRCODE_UNDEFINED_COLUMN),
788-
errmsg("cannot find function or field \"%s\"",
789+
errmsg("could not find function or field \"%s\"",
789790
trigger->tgargs[i])));
790791

791792
continue;

‎src/backend/access/common/tupdesc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.96 2003/07/21 20:29:38 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.97 2003/07/28 00:09:13 tgl Exp $
1212
*
1313
* NOTES
1414
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -703,7 +703,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
703703
else if (functyptype == 'p' && typeoid == RECORDOID)
704704
ereport(ERROR,
705705
(errcode(ERRCODE_DATATYPE_MISMATCH),
706-
errmsg("unable to determine tuple description for function returning record")));
706+
errmsg("could not determine tuple description for function returning record")));
707707
else
708708
{
709709
/* crummy error message, but parser should have caught this */

‎src/backend/access/gist/gistscan.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.44 2003/03/23 23:01:02 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.45 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -243,7 +243,8 @@ gistdropscan(IndexScanDesc s)
243243
prev = l;
244244

245245
if (l == (GISTScanList) NULL)
246-
elog(ERROR, "GiST scan list corrupted -- cannot find 0x%p", (void *) s);
246+
elog(ERROR, "GiST scan list corrupted -- could not find 0x%p",
247+
(void *) s);
247248

248249
if (prev == (GISTScanList) NULL)
249250
GISTScans = l->gsl_next;

‎src/backend/access/nbtree/nbtinsert.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.101 2003/07/21 20:29:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.102 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1064,7 +1064,7 @@ _bt_findsplitloc(Relation rel,
10641064
* just in case ...
10651065
*/
10661066
if (!state.have_split)
1067-
elog(ERROR, "cannot find a feasible split point for \"%s\"",
1067+
elog(ERROR, "could not find a feasible split point for \"%s\"",
10681068
RelationGetRelationName(rel));
10691069

10701070
*newitemonleft = state.newitemonleft;

‎src/backend/access/nbtree/nbtsearch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.75 2003/07/21 20:29:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.76 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1015,7 +1015,7 @@ _bt_walk_left(Relation rel, Buffer buf)
10151015
* if there's anything wrong.
10161016
*/
10171017
if (opaque->btpo_prev == lblkno)
1018-
elog(ERROR, "cannot find left sibling in \"%s\"",
1018+
elog(ERROR, "could not find left sibling in \"%s\"",
10191019
RelationGetRelationName(rel));
10201020
/* Okay to try again with new lblkno value */
10211021
}

‎src/backend/access/nbtree/nbtutils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.52 2003/07/21 20:29:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.53 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -461,7 +461,7 @@ _bt_getstrategynumber(RegProcedure sk_procedure, StrategyMap map)
461461
if (sk_procedure == map->entry[j].sk_procedure)
462462
return j;
463463
}
464-
elog(ERROR, "unable to identify operator %u", sk_procedure);
464+
elog(ERROR, "could not identify operator %u", sk_procedure);
465465
return -1; /* keep compiler quiet */
466466
}
467467

‎src/backend/access/rtree/rtscan.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.44 2003/07/21 20:29:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.45 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -248,7 +248,8 @@ rtdropscan(IndexScanDesc s)
248248
prev = l;
249249

250250
if (l == (RTScanList) NULL)
251-
elog(ERROR, "rtree scan list corrupted -- cannot find 0x%p", (void *) s);
251+
elog(ERROR, "rtree scan list corrupted -- could not find 0x%p",
252+
(void *) s);
252253

253254
if (prev == (RTScanList) NULL)
254255
RTScans = l->rtsl_next;

‎src/backend/access/transam/slru.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.2 2003/07/19 21:37:37 tgl Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.3 2003/07/28 00:09:14 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -811,7 +811,7 @@ restart:;
811811
{
812812
LWLockRelease(ctl->locks->ControlLock);
813813
ereport(LOG,
814-
(errmsg("unable to truncate \"%s\": apparent wraparound",
814+
(errmsg("could not truncate \"%s\": apparent wraparound",
815815
ctl->Dir)));
816816
return;
817817
}

‎src/backend/access/transam/xlog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.119 2003/07/21 20:29:39 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.120 2003/07/28 00:09:14 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -2642,7 +2642,7 @@ StartupXLOG(void)
26422642
}
26432643
else
26442644
ereport(PANIC,
2645-
(errmsg("unable to locate a valid checkpoint record")));
2645+
(errmsg("could not locate a valid checkpoint record")));
26462646
}
26472647
LastRec = RecPtr = checkPointLoc;
26482648
memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));

‎src/backend/catalog/dependency.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.27 2003/07/21 01:59:07 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.28 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1725,7 +1725,7 @@ getObjectDescription(const ObjectAddress *object)
17251725
}
17261726

17271727
default:
1728-
appendStringInfo(&buffer, "unknown object %u %u %d",
1728+
appendStringInfo(&buffer, "unrecognized object %u %u %d",
17291729
object->classId,
17301730
object->objectId,
17311731
object->objectSubId);

0 commit comments

Comments
 (0)