Skip to content

Commit 07bb9f0

Browse files
peterepetere
committed
Message corrections
1 parent a7335a3 commit 07bb9f0

File tree

16 files changed

+46
-48
lines changed

16 files changed

+46
-48
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.15 2005/10/15 02:49:09 momjian Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.16 2005/10/29 00:31:50 petere Exp $
1111
*
1212
* NOTES
1313
* Each global transaction is associated with a global transaction
@@ -904,7 +904,7 @@ EndPrepare(GlobalTransaction gxact)
904904
close(fd);
905905
ereport(ERROR,
906906
(errcode_for_file_access(),
907-
errmsg("could not seek twophase state file: %m")));
907+
errmsg("could not seek in twophase state file: %m")));
908908
}
909909

910910
/*

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.67 2005/10/15 02:49:09 momjian Exp $
9+
* $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.68 2005/10/29 00:31:50 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -66,9 +66,9 @@ GetNewTransactionId(bool isSubXact)
6666
TransactionIdFollowsOrEquals(xid, ShmemVariableCache->xidStopLimit))
6767
ereport(ERROR,
6868
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
69-
errmsg("database is not accepting queries to avoid wraparound data loss in database \"%s\"",
69+
errmsg("database is not accepting commands to avoid wraparound data loss in database \"%s\"",
7070
NameStr(ShmemVariableCache->limit_datname)),
71-
errhint("Stop the postmaster and use a standalone backend to VACUUM database \"%s\".",
71+
errhint("Stop the postmaster and use a standalone backend to vacuum database \"%s\".",
7272
NameStr(ShmemVariableCache->limit_datname))));
7373
else
7474
ereport(WARNING,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.221 2005/10/22 20:27:17 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.222 2005/10/29 00:31:50 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1468,7 +1468,7 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible)
14681468
ereport(PANIC,
14691469
(errcode_for_file_access(),
14701470
errmsg("could not write to log file %u, segment %u "
1471-
"at offset %u length %lu: %m",
1471+
"at offset %u, length %lu: %m",
14721472
openLogId, openLogSeg,
14731473
openLogOff, (unsigned long) nbytes)));
14741474
}
@@ -3558,7 +3558,7 @@ ReadControlFile(void)
35583558
if (ControlFile->floatFormat != FLOATFORMAT_VALUE)
35593559
ereport(FATAL,
35603560
(errmsg("database files are incompatible with server"),
3561-
errdetail("The database cluster appears to use a different floating-point format than the server executable."),
3561+
errdetail("The database cluster appears to use a different floating-point number format than the server executable."),
35623562
errhint("It looks like you need to initdb.")));
35633563
if (ControlFile->blcksz != BLCKSZ)
35643564
ereport(FATAL,

‎src/backend/catalog/pg_proc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.134 2005/10/15 02:49:14 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.135 2005/10/29 00:31:50 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -186,7 +186,7 @@ ProcedureCreate(const char *procedureName,
186186
if ((returnType == INTERNALOID || internalOutParam) && !internalInParam)
187187
ereport(ERROR,
188188
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
189-
errmsg("unsafe use of INTERNAL pseudo-type"),
189+
errmsg("unsafe use of pseudo-type \"internal\""),
190190
errdetail("A function returning \"internal\" must have at least one \"internal\" argument.")));
191191

192192
/*

‎src/backend/commands/cluster.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.140 2005/10/15 02:49:15 momjian Exp $
14+
* $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.141 2005/10/29 00:31:51 petere Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -356,13 +356,13 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck)
356356
if (!OldHeap->rd_att->attrs[colno - 1]->attnotnull)
357357
ereport(ERROR,
358358
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
359-
errmsg("cannot cluster on index \"%s\" because access method\n"
360-
"does not handle null values",
359+
errmsg("cannot cluster on index \"%s\" because access method does not handle null values",
361360
RelationGetRelationName(OldIndex)),
362-
errhint("You may be able to work around this by marking column \"%s\" NOT NULL%s",
363-
NameStr(OldHeap->rd_att->attrs[colno - 1]->attname),
364-
recheck ? ",\nor use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster\n"
365-
"specification from the table." : ".")));
361+
recheck
362+
? errhint("You may be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table.",
363+
NameStr(OldHeap->rd_att->attrs[colno - 1]->attname))
364+
: errhint("You may be able to work around this by marking column \"%s\" NOT NULL.",
365+
NameStr(OldHeap->rd_att->attrs[colno - 1]->attname))));
366366
}
367367
else if (colno < 0)
368368
{
@@ -372,8 +372,7 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck)
372372
/* index expression, lose... */
373373
ereport(ERROR,
374374
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
375-
errmsg("cannot cluster on expressional index \"%s\" because its index access\n"
376-
"method does not handle null values",
375+
errmsg("cannot cluster on expressional index \"%s\" because its index access method does not handle null values",
377376
RelationGetRelationName(OldIndex))));
378377
}
379378

‎src/backend/commands/user.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.162 2005/10/17 16:24:18 tgl Exp $
9+
* $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.163 2005/10/29 00:31:51 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -1194,7 +1194,7 @@ AddRoleMems(const char *rolename, Oid roleid,
11941194
if (grantorId != GetUserId() && !superuser())
11951195
ereport(ERROR,
11961196
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
1197-
errmsg("must be superuser to set grantor ID")));
1197+
errmsg("must be superuser to set grantor")));
11981198

11991199
/* We need only regular writer's lock on pg_auth_members */
12001200
pg_authmem_rel = heap_open(AuthMemRelationId, RowExclusiveLock);

‎src/backend/storage/freespace/freespace.c

Lines changed: 4 additions & 4 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-
* $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.49 2005/10/15 02:49:25 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.50 2005/10/29 00:31:51 petere Exp $
1212
*
1313
*
1414
* NOTES:
@@ -726,14 +726,14 @@ CheckFreeSpaceMapStatistics(int elevel, int numRels, double needed)
726726
ereport(elevel,
727727
(errmsg("max_fsm_relations(%d) equals the number of relations checked",
728728
MaxFSMRelations),
729-
errhint("You have >= %d relations.\n"
729+
errhint("You have at least %d relations. "
730730
"Consider increasing the configuration parameter \"max_fsm_relations\".",
731731
numRels)));
732732
else if (needed > MaxFSMPages)
733733
ereport(elevel,
734-
(errmsg("the number of page slots needed (%.0f) exceeds max_fsm_pages (%d)",
734+
(errmsg("number of page slots needed (%.0f) exceeds max_fsm_pages (%d)",
735735
needed, MaxFSMPages),
736-
errhint("Consider increasing the configuration parameter \"max_fsm_pages\"\n"
736+
errhint("Consider increasing the configuration parameter \"max_fsm_pages\" "
737737
"to a value over %.0f.", needed)));
738738
}
739739

‎src/backend/storage/lmgr/deadlock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $PostgreSQL: pgsql/src/backend/storage/lmgr/deadlock.c,v 1.35 2005/10/15 02:49:26 momjian Exp $
15+
* $PostgreSQL: pgsql/src/backend/storage/lmgr/deadlock.c,v 1.36 2005/10/29 00:31:51 petere Exp $
1616
*
1717
* Interface:
1818
*
@@ -888,7 +888,7 @@ DescribeLockTag(StringInfo buf, const LOCKTAG *lock)
888888
break;
889889
default:
890890
appendStringInfo(buf,
891-
_("unknown locktag type %d"),
891+
_("unrecognized locktag type %d"),
892892
lock->locktag_type);
893893
break;
894894
}

‎src/backend/utils/adt/dbsize.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright (c) 2002-2005, PostgreSQL Global Development Group
66
*
77
* IDENTIFICATION
8-
* $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.6 2005/10/15 02:49:28 momjian Exp $
8+
* $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.7 2005/10/29 00:31:51 petere Exp $
99
*
1010
*/
1111

@@ -53,7 +53,7 @@ db_dir_size(const char *path)
5353
if (stat(filename, &fst) < 0)
5454
ereport(ERROR,
5555
(errcode_for_file_access(),
56-
errmsg("could not stat \"%s\": %m", filename)));
56+
errmsg("could not stat file \"%s\": %m", filename)));
5757

5858
dirsize += fst.st_size;
5959
}
@@ -175,7 +175,7 @@ calculate_tablespace_size(Oid tblspcOid)
175175
if (stat(pathname, &fst) < 0)
176176
ereport(ERROR,
177177
(errcode_for_file_access(),
178-
errmsg("could not stat \"%s\": %m", pathname)));
178+
errmsg("could not stat file \"%s\": %m", pathname)));
179179

180180
if (fst.st_mode & S_IFDIR)
181181
totalsize += db_dir_size(pathname);
@@ -251,7 +251,7 @@ calculate_relation_size(RelFileNode *rfn)
251251
else
252252
ereport(ERROR,
253253
(errcode_for_file_access(),
254-
errmsg("could not stat \"%s\": %m", pathname)));
254+
errmsg("could not stat file \"%s\": %m", pathname)));
255255
}
256256
totalsize += fst.st_size;
257257
}

‎src/backend/utils/adt/genfile.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Author: Andreas Pflug <pgadmin@pse-consulting.de>
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.8 2005/10/15 19:47:09 tgl Exp $
12+
* $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.9 2005/10/29 00:31:51 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -122,7 +122,7 @@ pg_read_file(PG_FUNCTION_ARGS)
122122
if (bytes_to_read < 0)
123123
ereport(ERROR,
124124
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
125-
errmsg("requested length cannot be negative")));
125+
errmsg("requested length may not be negative")));
126126

127127
/* not sure why anyone thought that int64 length was a good idea */
128128
if (bytes_to_read > (MaxAllocSize - VARHDRSZ))

‎src/backend/utils/adt/oracle_compat.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.62 2005/10/15 02:49:29 momjian Exp $
12+
* $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.63 2005/10/29 00:31:51 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -214,7 +214,7 @@ win32_utf8_wcstotext(const wchar_t *str)
214214
if (nbytes == 0) /* shouldn't happen */
215215
ereport(ERROR,
216216
(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
217-
errmsg("UTF16 to UTF8 translation failed: %lu",
217+
errmsg("UTF-16 to UTF-8 translation failed: %lu",
218218
GetLastError())));
219219

220220
result = palloc(nbytes + VARHDRSZ);

‎src/backend/utils/adt/varlena.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.138 2005/10/18 20:38:58 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.139 2005/10/29 00:31:51 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -888,7 +888,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
888888
(LPWSTR) a1p, a1len / 2);
889889
if (!r)
890890
ereport(ERROR,
891-
(errmsg("could not convert string to UTF16: %lu",
891+
(errmsg("could not convert string to UTF-16: error %lu",
892892
GetLastError())));
893893
}
894894
((LPWSTR) a1p)[r] = 0;
@@ -901,7 +901,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
901901
(LPWSTR) a2p, a2len / 2);
902902
if (!r)
903903
ereport(ERROR,
904-
(errmsg("could not convert string to UTF16: %lu",
904+
(errmsg("could not convert string to UTF-16: error %lu",
905905
GetLastError())));
906906
}
907907
((LPWSTR) a2p)[r] = 0;
@@ -911,8 +911,7 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
911911
if (result == 2147483647) /* _NLSCMPERROR; missing from mingw
912912
* headers */
913913
ereport(ERROR,
914-
(errmsg("could not compare unicode strings: %d",
915-
errno)));
914+
(errmsg("could not compare Unicode strings: %m")));
916915

917916
if (a1p != a1buf)
918917
pfree(a1p);

‎src/backend/utils/mb/conv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.55 2005/10/15 02:49:33 momjian Exp $
9+
* $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.56 2005/10/29 00:31:52 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -379,7 +379,7 @@ UtfToLocal(unsigned char *utf, unsigned char *iso,
379379
{
380380
ereport(WARNING,
381381
(errcode(ERRCODE_UNTRANSLATABLE_CHARACTER),
382-
errmsg("ignoring unconvertible UTF8 character 0x%04x",
382+
errmsg("ignoring unconvertible UTF-8 character 0x%04x",
383383
iutf)));
384384
continue;
385385
}

‎src/backend/utils/mb/wchar.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* conversion functions between pg_wchar and multibyte streams.
33
* Tatsuo Ishii
4-
* $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.46 2005/10/15 02:49:33 momjian Exp $
4+
* $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.47 2005/10/29 00:31:52 petere Exp $
55
*
66
* WIN1250 client encoding updated by Pavel Behal
77
*
@@ -894,7 +894,7 @@ pg_verifymbstr(const char *mbstr, int len, bool noError)
894894
return false;
895895
ereport(ERROR,
896896
(errcode(ERRCODE_CHARACTER_NOT_IN_REPERTOIRE),
897-
errmsg("invalid UNICODE byte sequence detected near byte 0x%02x",
897+
errmsg("invalid UTF-8 byte sequence detected near byte 0x%02x",
898898
(unsigned char) *mbstr)));
899899
}
900900
}

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.295 2005/10/20 20:05:45 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.296 2005/10/29 00:31:52 petere Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -719,7 +719,7 @@ static struct config_bool ConfigureNamesBool[] =
719719

720720
{
721721
{"autovacuum", PGC_SIGHUP, AUTOVACUUM,
722-
gettext_noop("Starts the auto vacuum subprocess."),
722+
gettext_noop("Starts the autovacuum subprocess."),
723723
NULL
724724
},
725725
&autovacuum_start_daemon,

‎src/port/copydir.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* as a service.
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/port/copydir.c,v 1.15 2005/10/15 02:49:50 momjian Exp $
14+
* $PostgreSQL: pgsql/src/port/copydir.c,v 1.16 2005/10/29 00:31:52 petere Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -78,7 +78,7 @@ copydir(char *fromdir, char *todir, bool recurse)
7878
if (stat(fromfile, &fst) < 0)
7979
ereport(ERROR,
8080
(errcode_for_file_access(),
81-
errmsg("could not stat \"%s\": %m", fromfile)));
81+
errmsg("could not stat file \"%s\": %m", fromfile)));
8282

8383
if (fst.st_mode & S_IFDIR)
8484
{

0 commit comments

Comments
 (0)