database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-12 05:01:15 +03:00
Code Activity

Message style revisions

Browse Source
This commit is contained in:
Peter Eisentraut
2004-10-12 21:54:45 +00:00
parent 8532a1aabe
commit 0fd37839d9
23 changed files with 146 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/access/heap/heapam.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.177 2004/10/01 16:39:54 tgl Exp $
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.178 2004/10/12 21:54:34 petere Exp $
*
*
* INTERFACE ROUTINES
@@ -492,7 +492,7 @@ conditional_relation_open(Oid relationId, LOCKMODE lockmode, bool nowait)
if (!ConditionalLockRelation(r, lockmode))
ereport(ERROR,
(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
errmsg("could not obtain lock on \"%s\"",
errmsg("could not obtain lock on relation \"%s\"",
RelationGetRelationName(r))));
}
else

16
src/backend/access/transam/xlog.c
View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.172 2004/10/09 02:46:40 momjian Exp $
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.173 2004/10/12 21:54:35 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1933,7 +1933,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
errmsg("could not stat \"%s\": %m",
errmsg("could not stat file \"%s\": %m",
xlogpath)));
}
else
@@ -2035,7 +2035,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
errmsg("could not stat \"%s\": %m",
errmsg("could not stat file \"%s\": %m",
xlogpath)));
}
}
@@ -2739,7 +2739,7 @@ readTimeLineHistory(TimeLineID targetTLI)
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
errmsg("could not open \"%s\": %m", path)));
errmsg("could not open file \"%s\": %m", path)));
/* Not there, so assume no parents */
return list_make1_int((int) targetTLI);
}
@@ -2829,7 +2829,7 @@ existsTimeLineHistory(TimeLineID probeTLI)
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
errmsg("could not open \"%s\": %m", path)));
errmsg("could not open file \"%s\": %m", path)));
return false;
}
}
@@ -2927,7 +2927,7 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI,
if (errno != ENOENT)
ereport(FATAL,
(errcode_for_file_access(),
errmsg("could not open \"%s\": %m", path)));
errmsg("could not open file \"%s\": %m", path)));
/* Not there, so assume parent has no parents */
}
else
@@ -4077,7 +4077,7 @@ StartupXLOG(void)
{
ereport(PANIC,
(errmsg("could not locate required checkpoint record"),
errhint("If you are not restoring from a backup, try removing $PGDATA/backup_label.")));
errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));
}
}
else
@@ -5288,7 +5288,7 @@ pg_start_backup(PG_FUNCTION_ARGS)
if (errno != ENOENT)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not stat \"%s\": %m",
errmsg("could not stat file \"%s\": %m",
labelfilepath)));
}
else

4
src/backend/catalog/dependency.c
View File

@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.39 2004/08/29 05:06:41 momjian Exp $
* $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.40 2004/10/12 21:54:36 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1623,7 +1623,7 @@ getObjectDescription(const ObjectAddress *object)
else
nspname = get_namespace_name(opcForm->opcnamespace);
appendStringInfo(&buffer, gettext("operator class %s for %s"),
appendStringInfo(&buffer, gettext("operator class %s for access method %s"),
quote_qualified_identifier(nspname,
NameStr(opcForm->opcname)),
NameStr(amForm->amname));

4
src/backend/commands/tablecmds.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.133 2004/09/23 23:20:24 tgl Exp $
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.134 2004/10/12 21:54:36 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -5392,7 +5392,7 @@ ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, char *tablespacename)
if (OidIsValid(tab->newTableSpace))
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("multiple SET TABLESPACE subcommands are not valid")));
errmsg("cannot have multiple SET TABLESPACE subcommands")));
tab->newTableSpace = tablespaceId;
}

6
src/backend/executor/spi.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.129 2004/09/16 20:17:20 tgl Exp $
* $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.130 2004/10/12 21:54:37 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -188,7 +188,7 @@ AtEOXact_SPI(bool isCommit)
ereport(WARNING,
(errcode(ERRCODE_WARNING),
errmsg("transaction left non-empty SPI stack"),
errhint("Check for missing \"SPI_finish\" calls")));
errhint("Check for missing \"SPI_finish\" calls.")));
_SPI_current = _SPI_stack = NULL;
_SPI_stack_depth = 0;
@@ -1571,7 +1571,7 @@ _SPI_error_callback(void *arg)
internalerrquery(query);
}
else
errcontext("SQL query \"%s\"", query);
errcontext("SQL statement \"%s\"", query);
}
/*

16
src/backend/libpq/auth.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.118 2004/08/29 05:06:43 momjian Exp $
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.119 2004/10/12 21:54:38 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -363,24 +363,24 @@ auth_failed(Port *port, int status)
switch (port->auth_method)
{
case uaReject:
errstr = gettext_noop("Rejected host: authentication failed for user \"%s\"");
errstr = gettext_noop("authentication failed for user \"%s\": host rejected");
break;
case uaKrb4:
errstr = gettext_noop("Kerberos4 authentication failed for user \"%s\"");
errstr = gettext_noop("Kerberos 4 authentication failed for user \"%s\"");
break;
case uaKrb5:
errstr = gettext_noop("Kerberos5 authentication failed for user \"%s\"");
errstr = gettext_noop("Kerberos 5 authentication failed for user \"%s\"");
break;
case uaTrust:
errstr = gettext_noop("Trusted authentication failed for user \"%s\"");
errstr = gettext_noop("\"trust\" authentication failed for user \"%s\"");
break;
case uaIdent:
errstr = gettext_noop("IDENT authentication failed for user \"%s\"");
errstr = gettext_noop("Ident authentication failed for user \"%s\"");
break;
case uaMD5:
case uaCrypt:
case uaPassword:
errstr = gettext_noop("Password authentication failed for user \"%s\"");
errstr = gettext_noop("password authentication failed for user \"%s\"");
break;
#ifdef USE_PAM
case uaPAM:
@@ -388,7 +388,7 @@ auth_failed(Port *port, int status)
break;
#endif /* USE_PAM */
default:
errstr = gettext_noop("Unknown auth method: authentication failed for user \"%s\"");
errstr = gettext_noop("authentication failed for user \"%s\": invalid authentication method");
break;
}

18
src/backend/libpq/hba.c
View File

@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.132 2004/10/09 23:12:57 tgl Exp $
* $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.133 2004/10/12 21:54:38 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -737,7 +737,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
{
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid IP address \"%s\" in \"%s\" line %d: %s",
errmsg("invalid IP address \"%s\" in file \"%s\" line %d: %s",
token, HbaFileName, line_num,
gai_strerror(ret))));
if (cidr_slash)
@@ -772,7 +772,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
{
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid IP mask \"%s\" in \"%s\" line %d: %s",
errmsg("invalid IP mask \"%s\" in file \"%s\" line %d: %s",
token, HbaFileName, line_num,
gai_strerror(ret))));
if (gai_result)
@@ -787,7 +787,7 @@ parse_hba(List *line, int line_num, hbaPort *port,
{
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("IP address and mask do not match in \"%s\" line %d",
errmsg("IP address and mask do not match in file \"%s\" line %d",
HbaFileName, line_num)));
goto hba_other_error;
}
@@ -845,13 +845,13 @@ hba_syntax:
if (line_item)
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid entry in \"%s\" at line %d, token \"%s\"",
errmsg("invalid entry in file \"%s\" at line %d, token \"%s\"",
HbaFileName, line_num,
(char *) lfirst(line_item))));
else
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("missing field in \"%s\" at end of line %d",
errmsg("missing field in file \"%s\" at end of line %d",
HbaFileName, line_num)));
/* Come here if suitable message already logged */
@@ -1101,13 +1101,13 @@ ident_syntax:
if (line_item)
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid entry in \"%s\" at line %d, token \"%s\"",
errmsg("invalid entry in file \"%s\" at line %d, token \"%s\"",
IdentFileName, line_number,
(const char *) lfirst(line_item))));
else
ereport(LOG,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("missing entry in \"%s\" at end of line %d",
errmsg("missing entry in file \"%s\" at end of line %d",
IdentFileName, line_number)));
*error_p = true;
@@ -1634,7 +1634,7 @@ authident(hbaPort *port)
}
ereport(DEBUG1,
(errmsg("IDENT code identifies remote user as \"%s\"",
(errmsg("Ident protocol identifies remote user as \"%s\"",
ident_user)));
if (check_ident_usermap(port->auth_arg, port->user_name, ident_user))

6
src/backend/main/main.c
View File

@@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.90 2004/09/24 06:29:07 neilc Exp $
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.91 2004/10/12 21:54:38 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -243,9 +243,9 @@ main(int argc, char *argv[])
#else /* WIN32 */
if (pgwin32_is_admin())
{
write_stderr("execution of PostgreSQL by a user with administrative permissions is not permitted.\n"
write_stderr("Execution of PostgreSQL by a user with administrative permissions is not permitted.\n"
"The server must be started under an unprivileged user ID to prevent\n"
"possible system security compromise. See the documentation for\n"
"possible system security compromises. See the documentation for\n"
"more information on how to properly start the server.\n");
exit(1);
}

26
src/backend/port/win32/security.c
View File

@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.4 2004/08/29 05:06:46 momjian Exp $
* $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.5 2004/10/12 21:54:39 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -36,20 +36,20 @@ pgwin32_is_admin(void)
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
{
write_stderr("failed to open process token: %d\n",
write_stderr("could not open process token: %d\n",
(int) GetLastError());
exit(1);
}
if (GetTokenInformation(AccessToken, TokenGroups, NULL, 0, &InfoBufferSize))
{
write_stderr("failed to get token information - got zero size!\n");
write_stderr("could not get token information: got zero size\n");
exit(1);
}
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
{
write_stderr("failed to get token information: %d\n",
write_stderr("could not get token information: %d\n",
(int) GetLastError());
exit(1);
}
@@ -57,7 +57,7 @@ pgwin32_is_admin(void)
InfoBuffer = malloc(InfoBufferSize);
if (!InfoBuffer)
{
write_stderr("failed to allocate %i bytes for token information!\n",
write_stderr("could not allocate %i bytes for token information\n",
(int) InfoBufferSize);
exit(1);
}
@@ -66,7 +66,7 @@ pgwin32_is_admin(void)
if (!GetTokenInformation(AccessToken, TokenGroups, InfoBuffer,
InfoBufferSize, &InfoBufferSize))
{
write_stderr("failed to get token information: %d\n",
write_stderr("could not get token information: %d\n",
(int) GetLastError());
exit(1);
}
@@ -77,7 +77,7 @@ pgwin32_is_admin(void)
SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0,
0, &AdministratorsSid))
{
write_stderr("failed to get SID for Administrators group: %d\n",
write_stderr("could not get SID for Administrators group: %d\n",
(int) GetLastError());
exit(1);
}
@@ -86,7 +86,7 @@ pgwin32_is_admin(void)
SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_POWER_USERS, 0, 0, 0, 0, 0,
0, &PowerUsersSid))
{
write_stderr("failed to get SID for PowerUsers group: %d\n",
write_stderr("could not get SID for PowerUsers group: %d\n",
(int) GetLastError());
exit(1);
}
@@ -146,7 +146,7 @@ pgwin32_is_service(void)
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &AccessToken))
{
fprintf(stderr, "failed to open process token: %d\n",
fprintf(stderr, "could not open process token: %d\n",
(int) GetLastError());
return -1;
}
@@ -154,7 +154,7 @@ pgwin32_is_service(void)
/* First check for local system */
if (!GetTokenInformation(AccessToken, TokenUser, InfoBuffer, 1024, &InfoBufferSize))
{
fprintf(stderr, "failed to get token information: %d\n",
fprintf(stderr, "could not get token information: %d\n",
(int) GetLastError());
return -1;
}
@@ -163,7 +163,7 @@ pgwin32_is_service(void)
SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0,
&LocalSystemSid))
{
fprintf(stderr, "failed to get SID for local system account\n");
fprintf(stderr, "could not get SID for local system account\n");
CloseHandle(AccessToken);
return -1;
}
@@ -181,7 +181,7 @@ pgwin32_is_service(void)
/* Now check for group SID */
if (!GetTokenInformation(AccessToken, TokenGroups, InfoBuffer, 1024, &InfoBufferSize))
{
fprintf(stderr, "failed to get token information: %d\n",
fprintf(stderr, "could not get token information: %d\n",
(int) GetLastError());
return -1;
}
@@ -190,7 +190,7 @@ pgwin32_is_service(void)
SECURITY_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0,
&ServiceSid))
{
fprintf(stderr, "failed to get SID for service group\n");
fprintf(stderr, "could not get SID for service group\n");
CloseHandle(AccessToken);
return -1;
}

6
src/backend/port/win32/signal.c
View File

@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.7 2004/08/29 05:06:46 momjian Exp $
* $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.8 2004/10/12 21:54:39 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -224,7 +224,7 @@ pg_signal_thread(LPVOID param)
PIPE_UNLIMITED_INSTANCES, 16, 16, 1000, NULL);
if (pipe == INVALID_HANDLE_VALUE)
{
write_stderr("failed to create signal listener pipe: %d. Retrying.\n", (int) GetLastError());
write_stderr("could not create signal listener pipe: %d; retrying\n", (int) GetLastError());
SleepEx(500, FALSE);
continue;
}
@@ -236,7 +236,7 @@ pg_signal_thread(LPVOID param)
(LPTHREAD_START_ROUTINE) pg_signal_dispatch_thread,
(LPVOID) pipe, 0, NULL);
if (hThread == INVALID_HANDLE_VALUE)
write_stderr("failed to create signal dispatch thread: %d\n",
write_stderr("could not create signal dispatch thread: %d\n",
(int) GetLastError());
else
CloseHandle(hThread);

4
src/backend/postmaster/bgwriter.c
View File

@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.8 2004/08/29 05:06:46 momjian Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.9 2004/10/12 21:54:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -487,7 +487,7 @@ BgWriterShmemInit(void)
if (BgWriterShmem == NULL)
ereport(FATAL,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("insufficient shared memory for bgwriter")));
errmsg("not enough shared memory for background writer")));
if (found)
return; /* already initialized */

6
src/backend/postmaster/postmaster.c
View File

@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.431 2004/10/09 23:13:02 tgl Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.432 2004/10/12 21:54:40 petere Exp $
*
* NOTES
*
@@ -796,7 +796,7 @@ PostmasterMain(int argc, char *argv[])
/* Should we remove the pid file on postmaster exit? */
}
else
write_stderr("%s: could not write external pid file \"%s\": %s\n",
write_stderr("%s: could not write external PID file \"%s\": %s\n",
progname, external_pid_file, strerror(errno));
}
@@ -3759,7 +3759,7 @@ win32_sigchld_waiter(LPVOID param)
if (r == WAIT_OBJECT_0)
pg_queue_signal(SIGCHLD);
else
write_stderr("ERROR: failed to wait on child process handle: %d\n",
write_stderr("could not wait on child process handle: %d\n",
(int) GetLastError());
CloseHandle(procHandle);
return 0;

12
src/backend/postmaster/syslogger.c
View File

@@ -18,7 +18,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.9 2004/09/21 00:21:25 tgl Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.10 2004/10/12 21:54:40 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -402,7 +402,7 @@ SysLogger_Start(void)
if (pgpipe(syslogPipe) < 0)
ereport(FATAL,
(errcode_for_socket_access(),
(errmsg("could not create pipe for syslogging: %m"))));
(errmsg("could not create pipe for syslog: %m"))));
}
#else
if (!syslogPipe[0])
@@ -444,7 +444,7 @@ SysLogger_Start(void)
if (!syslogFile)
ereport(FATAL,
(errcode_for_file_access(),
(errmsg("could not create logfile \"%s\": %m",
(errmsg("could not create log file \"%s\": %m",
filename))));
setvbuf(syslogFile, NULL, LBF_MODE, 0);
@@ -700,7 +700,7 @@ write_syslogger_file_binary(const char *buffer, int count)
if (rc != count)
ereport(LOG,
(errcode_for_file_access(),
errmsg("could not write to logfile: %m")));
errmsg("could not write to log file: %m")));
}
#ifdef WIN32
@@ -787,7 +787,7 @@ logfile_rotate(bool time_based_rotation)
ereport(LOG,
(errcode_for_file_access(),
errmsg("could not open new logfile \"%s\": %m",
errmsg("could not open new log file \"%s\": %m",
filename)));
/*
@@ -799,7 +799,7 @@ logfile_rotate(bool time_based_rotation)
if (saveerrno != ENFILE && saveerrno != EMFILE)
{
ereport(LOG,
(errmsg("disabling auto rotation (use SIGHUP to reenable)")));
(errmsg("disabling automatic rotation (use SIGHUP to reenable)")));
Log_RotationAge = 0;
Log_RotationSize = 0;
}

4
src/backend/tcop/postgres.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.434 2004/10/08 01:36:35 tgl Exp $
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.435 2004/10/12 21:54:40 petere Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -2127,7 +2127,7 @@ usage(const char *progname)
printf(gettext(" -o FILENAME send stdout and stderr to given file\n"));
printf(gettext(" -P disable system indexes\n"));
printf(gettext(" -s show statistics after each query\n"));
printf(gettext(" -S WORK-MEM set amount of memory for sorts (in kbytes)\n"));
printf(gettext(" -S WORK-MEM set amount of memory for sorts (in kB)\n"));
printf(gettext(" --describe-config describe configuration parameters, then exit\n"));
printf(gettext(" --help show this help, then exit\n"));
printf(gettext(" --version output version information, then exit\n"));

4
src/backend/utils/adt/misc.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.38 2004/08/29 05:06:49 momjian Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.39 2004/10/12 21:54:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -174,7 +174,7 @@ pg_tablespace_databases(PG_FUNCTION_ARGS)
errmsg("could not open directory \"%s\": %m",
fctx->location)));
ereport(WARNING,
(errmsg("%u is not a tablespace oid", tablespaceOid)));
(errmsg("%u is not a tablespace OID", tablespaceOid)));
}
}
funcctx->user_fctx = fctx;

34
src/backend/utils/misc/guc.c
View File

@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.242 2004/10/10 23:37:28 neilc Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.243 2004/10/12 21:54:42 petere Exp $
*
*--------------------------------------------------------------------
*/
@@ -489,7 +489,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"log_disconnections", PGC_BACKEND, LOGGING_WHAT,
gettext_noop("Logs end of a session, including duration"),
gettext_noop("Logs end of a session, including duration."),
NULL
},
&Log_disconnections,
@@ -805,7 +805,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"default_with_oids", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
gettext_noop("By default, newly-created tables should have OIDs"),
gettext_noop("By default, newly-created tables should have OIDs."),
NULL
},
&default_with_oids,
@@ -813,7 +813,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"redirect_stderr", PGC_POSTMASTER, LOGGING_WHERE,
gettext_noop("Start a subprocess to capture stderr output into log files"),
gettext_noop("Start a subprocess to capture stderr output into log files."),
NULL
},
&Redirect_stderr,
@@ -821,7 +821,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"log_truncate_on_rotation", PGC_SIGHUP, LOGGING_WHERE,
gettext_noop("Truncate existing log files of same name during log rotation"),
gettext_noop("Truncate existing log files of same name during log rotation."),
NULL
},
&Log_truncate_on_rotation,
@@ -1273,7 +1273,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"log_rotation_age", PGC_SIGHUP, LOGGING_WHERE,
gettext_noop("Automatic logfile rotation will occur after N minutes"),
gettext_noop("Automatic log file rotation will occur after N minutes"),
NULL
},
&Log_RotationAge,
@@ -1282,7 +1282,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"log_rotation_size", PGC_SIGHUP, LOGGING_WHERE,
gettext_noop("Automatic logfile rotation will occur after N kilobytes"),
gettext_noop("Automatic log file rotation will occur after N kilobytes"),
NULL
},
&Log_RotationSize,
@@ -1291,7 +1291,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"max_function_args", PGC_INTERNAL, PRESET_OPTIONS,
gettext_noop("Shows the maximum number of function arguments"),
gettext_noop("Shows the maximum number of function arguments."),
NULL,
GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
},
@@ -1301,7 +1301,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"max_index_keys", PGC_INTERNAL, PRESET_OPTIONS,
gettext_noop("Shows the maximum number of index keys"),
gettext_noop("Shows the maximum number of index keys."),
NULL,
GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
},
@@ -1671,8 +1671,8 @@ static struct config_string ConfigureNamesString[] =
{
{"log_destination", PGC_SIGHUP, LOGGING_WHERE,
gettext_noop("Sets the destination for server log output."),
gettext_noop("Valid values are combinations of stderr, syslog "
"and eventlog, depending on platform."),
gettext_noop("Valid values are combinations of \"stderr\", \"syslog\", "
"and \"eventlog\", depending on the platform."),
GUC_LIST_INPUT
},
&log_destination_string,
@@ -1786,7 +1786,7 @@ static struct config_string ConfigureNamesString[] =
{
{"data_directory", PGC_POSTMASTER, FILE_LOCATIONS,
gettext_noop("Sets the server's data directory"),
gettext_noop("Sets the server's data directory."),
NULL
},
&data_directory,
@@ -1795,7 +1795,7 @@ static struct config_string ConfigureNamesString[] =
{
{"config_file", PGC_POSTMASTER, FILE_LOCATIONS,
gettext_noop("Sets the server's main configuration file"),
gettext_noop("Sets the server's main configuration file."),
NULL,
GUC_DISALLOW_IN_FILE
},
@@ -1823,7 +1823,7 @@ static struct config_string ConfigureNamesString[] =
{
{"external_pid_file", PGC_POSTMASTER, FILE_LOCATIONS,
gettext_noop("Writes the postmaster PID to the specified file"),
gettext_noop("Writes the postmaster PID to the specified file."),
NULL
},
&external_pid_file,
@@ -2480,7 +2480,7 @@ SelectConfigFiles(const char *userDoption, const char *progname)
else if (!configdir)
{
write_stderr("%s does not know where to find the server configuration file.\n"
"You must specify the --config_file or -D invocation "
"You must specify the --config-file or -D invocation "
"option or set the PGDATA environment variable.\n",
progname);
return false;
@@ -5403,7 +5403,7 @@ assign_log_destination(const char *value, bool doit, GucSource source)
if (source >= PGC_S_INTERACTIVE)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unrecognised \"log_destination\" key word: \"%s\"",
errmsg("unrecognized \"log_destination\" key word: \"%s\"",
tok)));
pfree(rawstring);
list_free(elemlist);
@@ -5685,7 +5685,7 @@ assign_custom_variable_classes(const char *newval, bool doit, GucSource source)
*/
ereport(LOG,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("invalid syntax for custom_variable_classes: \"%s\"", newval)));
errmsg("invalid syntax for \"custom_variable_classes\": \"%s\"", newval)));
pfree(buf.data);
return NULL;
}