Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0fd3783

Browse files
peterepetere
committed
Message style revisions
1 parent 8532a1a commit 0fd3783

File tree

23 files changed

+146
-142
lines changed

23 files changed

+146
-142
lines changed

‎src/backend/access/heap/heapam.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/access/heap/heapam.c,v 1.177 2004/10/01 16:39:54 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.178 2004/10/12 21:54:34 petere Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -492,7 +492,7 @@ conditional_relation_open(Oid relationId, LOCKMODE lockmode, bool nowait)
492492
if (!ConditionalLockRelation(r, lockmode))
493493
ereport(ERROR,
494494
(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
495-
errmsg("could not obtain lock on \"%s\"",
495+
errmsg("could not obtain lock on relation \"%s\"",
496496
RelationGetRelationName(r))));
497497
}
498498
else

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2004, 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.172 2004/10/09 02:46:40 momjian Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.173 2004/10/12 21:54:35 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1933,7 +1933,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
19331933
if (errno != ENOENT)
19341934
ereport(FATAL,
19351935
(errcode_for_file_access(),
1936-
errmsg("could not stat \"%s\": %m",
1936+
errmsg("could not stat file \"%s\": %m",
19371937
xlogpath)));
19381938
}
19391939
else
@@ -2035,7 +2035,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
20352035
if (errno != ENOENT)
20362036
ereport(FATAL,
20372037
(errcode_for_file_access(),
2038-
errmsg("could not stat \"%s\": %m",
2038+
errmsg("could not stat file \"%s\": %m",
20392039
xlogpath)));
20402040
}
20412041
}
@@ -2739,7 +2739,7 @@ readTimeLineHistory(TimeLineID targetTLI)
27392739
if (errno != ENOENT)
27402740
ereport(FATAL,
27412741
(errcode_for_file_access(),
2742-
errmsg("could not open \"%s\": %m", path)));
2742+
errmsg("could not open file \"%s\": %m", path)));
27432743
/* Not there, so assume no parents */
27442744
return list_make1_int((int) targetTLI);
27452745
}
@@ -2829,7 +2829,7 @@ existsTimeLineHistory(TimeLineID probeTLI)
28292829
if (errno != ENOENT)
28302830
ereport(FATAL,
28312831
(errcode_for_file_access(),
2832-
errmsg("could not open \"%s\": %m", path)));
2832+
errmsg("could not open file \"%s\": %m", path)));
28332833
return false;
28342834
}
28352835
}
@@ -2927,7 +2927,7 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI,
29272927
if (errno != ENOENT)
29282928
ereport(FATAL,
29292929
(errcode_for_file_access(),
2930-
errmsg("could not open \"%s\": %m", path)));
2930+
errmsg("could not open file \"%s\": %m", path)));
29312931
/* Not there, so assume parent has no parents */
29322932
}
29332933
else
@@ -4077,7 +4077,7 @@ StartupXLOG(void)
40774077
{
40784078
ereport(PANIC,
40794079
(errmsg("could not locate required checkpoint record"),
4080-
errhint("If you are not restoring from a backup, try removing $PGDATA/backup_label.")));
4080+
errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));
40814081
}
40824082
}
40834083
else
@@ -5288,7 +5288,7 @@ pg_start_backup(PG_FUNCTION_ARGS)
52885288
if (errno != ENOENT)
52895289
ereport(ERROR,
52905290
(errcode_for_file_access(),
5291-
errmsg("could not stat \"%s\": %m",
5291+
errmsg("could not stat file \"%s\": %m",
52925292
labelfilepath)));
52935293
}
52945294
else

‎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-
* $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.39 2004/08/29 05:06:41 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.40 2004/10/12 21:54:36 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1623,7 +1623,7 @@ getObjectDescription(const ObjectAddress *object)
16231623
else
16241624
nspname = get_namespace_name(opcForm->opcnamespace);
16251625

1626-
appendStringInfo(&buffer, gettext("operator class %s for %s"),
1626+
appendStringInfo(&buffer, gettext("operator class %s for access method %s"),
16271627
quote_qualified_identifier(nspname,
16281628
NameStr(opcForm->opcname)),
16291629
NameStr(amForm->amname));

‎src/backend/commands/tablecmds.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/commands/tablecmds.c,v 1.133 2004/09/23 23:20:24 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.134 2004/10/12 21:54:36 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -5392,7 +5392,7 @@ ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, char *tablespacename)
53925392
if (OidIsValid(tab->newTableSpace))
53935393
ereport(ERROR,
53945394
(errcode(ERRCODE_SYNTAX_ERROR),
5395-
errmsg("multiple SET TABLESPACE subcommands are not valid")));
5395+
errmsg("cannot have multiple SET TABLESPACE subcommands")));
53965396
tab->newTableSpace = tablespaceId;
53975397
}
53985398

‎src/backend/executor/spi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.129 2004/09/16 20:17:20 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.130 2004/10/12 21:54:37 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -188,7 +188,7 @@ AtEOXact_SPI(bool isCommit)
188188
ereport(WARNING,
189189
(errcode(ERRCODE_WARNING),
190190
errmsg("transaction left non-empty SPI stack"),
191-
errhint("Check for missing \"SPI_finish\" calls")));
191+
errhint("Check for missing \"SPI_finish\" calls.")));
192192

193193
_SPI_current = _SPI_stack = NULL;
194194
_SPI_stack_depth = 0;
@@ -1571,7 +1571,7 @@ _SPI_error_callback(void *arg)
15711571
internalerrquery(query);
15721572
}
15731573
else
1574-
errcontext("SQL query \"%s\"", query);
1574+
errcontext("SQL statement \"%s\"", query);
15751575
}
15761576

15771577
/*

‎src/backend/libpq/auth.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.118 2004/08/29 05:06:43 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.119 2004/10/12 21:54:38 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -363,32 +363,32 @@ auth_failed(Port *port, int status)
363363
switch (port->auth_method)
364364
{
365365
case uaReject:
366-
errstr = gettext_noop("Rejected host: authentication failed for user \"%s\"");
366+
errstr = gettext_noop("authentication failed for user \"%s\": host rejected");
367367
break;
368368
case uaKrb4:
369-
errstr = gettext_noop("Kerberos4 authentication failed for user \"%s\"");
369+
errstr = gettext_noop("Kerberos 4 authentication failed for user \"%s\"");
370370
break;
371371
case uaKrb5:
372-
errstr = gettext_noop("Kerberos5 authentication failed for user \"%s\"");
372+
errstr = gettext_noop("Kerberos 5 authentication failed for user \"%s\"");
373373
break;
374374
case uaTrust:
375-
errstr = gettext_noop("Trusted authentication failed for user \"%s\"");
375+
errstr = gettext_noop("\"trust\" authentication failed for user \"%s\"");
376376
break;
377377
case uaIdent:
378-
errstr = gettext_noop("IDENT authentication failed for user \"%s\"");
378+
errstr = gettext_noop("Ident authentication failed for user \"%s\"");
379379
break;
380380
case uaMD5:
381381
case uaCrypt:
382382
case uaPassword:
383-
errstr = gettext_noop("Password authentication failed for user \"%s\"");
383+
errstr = gettext_noop("password authentication failed for user \"%s\"");
384384
break;
385385
#ifdef USE_PAM
386386
case uaPAM:
387387
errstr = gettext_noop("PAM authentication failed for user \"%s\"");
388388
break;
389389
#endif /* USE_PAM */
390390
default:
391-
errstr = gettext_noop("Unknown auth method: authentication failed for user \"%s\"");
391+
errstr = gettext_noop("authentication failed for user \"%s\": invalid authentication method");
392392
break;
393393
}
394394

‎src/backend/libpq/hba.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.132 2004/10/09 23:12:57 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.133 2004/10/12 21:54:38 petere Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -737,7 +737,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
737737
{
738738
ereport(LOG,
739739
(errcode(ERRCODE_CONFIG_FILE_ERROR),
740-
errmsg("invalid IP address \"%s\" in \"%s\" line %d: %s",
740+
errmsg("invalid IP address \"%s\" in file \"%s\" line %d: %s",
741741
token, HbaFileName, line_num,
742742
gai_strerror(ret))));
743743
if (cidr_slash)
@@ -772,7 +772,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
772772
{
773773
ereport(LOG,
774774
(errcode(ERRCODE_CONFIG_FILE_ERROR),
775-
errmsg("invalid IP mask \"%s\" in \"%s\" line %d: %s",
775+
errmsg("invalid IP mask \"%s\" in file \"%s\" line %d: %s",
776776
token, HbaFileName, line_num,
777777
gai_strerror(ret))));
778778
if (gai_result)
@@ -787,7 +787,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
787787
{
788788
ereport(LOG,
789789
(errcode(ERRCODE_CONFIG_FILE_ERROR),
790-
errmsg("IP address and mask do not match in \"%s\" line %d",
790+
errmsg("IP address and mask do not match in file \"%s\" line %d",
791791
HbaFileName, line_num)));
792792
goto hba_other_error;
793793
}
@@ -845,13 +845,13 @@ parse_hba(List *line, int line_num, hbaPort *port,
845845
if (line_item)
846846
ereport(LOG,
847847
(errcode(ERRCODE_CONFIG_FILE_ERROR),
848-
errmsg("invalid entry in \"%s\" at line %d, token \"%s\"",
848+
errmsg("invalid entry in file \"%s\" at line %d, token \"%s\"",
849849
HbaFileName, line_num,
850850
(char *) lfirst(line_item))));
851851
else
852852
ereport(LOG,
853853
(errcode(ERRCODE_CONFIG_FILE_ERROR),
854-
errmsg("missing field in \"%s\" at end of line %d",
854+
errmsg("missing field in file \"%s\" at end of line %d",
855855
HbaFileName, line_num)));
856856

857857
/* Come here if suitable message already logged */
@@ -1101,13 +1101,13 @@ parse_ident_usermap(List *line, int line_number, const char *usermap_name,
11011101
if (line_item)
11021102
ereport(LOG,
11031103
(errcode(ERRCODE_CONFIG_FILE_ERROR),
1104-
errmsg("invalid entry in \"%s\" at line %d, token \"%s\"",
1104+
errmsg("invalid entry in file \"%s\" at line %d, token \"%s\"",
11051105
IdentFileName, line_number,
11061106
(const char *) lfirst(line_item))));
11071107
else
11081108
ereport(LOG,
11091109
(errcode(ERRCODE_CONFIG_FILE_ERROR),
1110-
errmsg("missing entry in \"%s\" at end of line %d",
1110+
errmsg("missing entry in file \"%s\" at end of line %d",
11111111
IdentFileName, line_number)));
11121112

11131113
*error_p = true;
@@ -1634,7 +1634,7 @@ authident(hbaPort *port)
16341634
}
16351635

16361636
ereport(DEBUG1,
1637-
(errmsg("IDENT code identifies remote user as \"%s\"",
1637+
(errmsg("Ident protocol identifies remote user as \"%s\"",
16381638
ident_user)));
16391639

16401640
if (check_ident_usermap(port->auth_arg, port->user_name, ident_user))

‎src/backend/main/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.90 2004/09/24 06:29:07 neilc Exp $
16+
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.91 2004/10/12 21:54:38 petere Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
@@ -243,9 +243,9 @@ main(int argc, char *argv[])
243243
#else /* WIN32 */
244244
if (pgwin32_is_admin())
245245
{
246-
write_stderr("execution of PostgreSQL by a user with administrative permissions is not permitted.\n"
246+
write_stderr("Execution of PostgreSQL by a user with administrative permissions is not permitted.\n"
247247
"The server must be started under an unprivileged user ID to prevent\n"
248-
"possible system security compromise. See the documentation for\n"
248+
"possible system security compromises. See the documentation for\n"
249249
"more information on how to properly start the server.\n");
250250
exit(1);
251251
}

0 commit comments

Comments
 (0)