Small message clarifications

This commit is contained in:
Peter Eisentraut 2004-11-05 17:11:34 +00:00
parent a23db90ce0
commit 0ed3c7665e
5 changed files with 13 additions and 12 deletions

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.175 2004/10/29 00:16:08 tgl Exp $
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.176 2004/11/05 17:10:56 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -1660,7 +1660,7 @@ XLogFileCopy(uint32 log, uint32 seg,
errmsg("could not read file \"%s\": %m", path)));
else
ereport(PANIC,
(errmsg("insufficient data in file \"%s\"", path)));
(errmsg("not enough data in file \"%s\"", path)));
}
errno = 0;
if ((int) write(fd, buffer, sizeof(buffer)) != (int) sizeof(buffer))
@ -2049,7 +2049,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
* program incorrectly. We have to assume the former.
*/
ereport(DEBUG1,
(errmsg("could not restore \"%s\" from archive: return code %d",
(errmsg("could not restore file \"%s\" from archive: return code %d",
xlogfname, rc)));
/*

View File

@ -45,7 +45,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.12 2004/10/17 20:47:20 tgl Exp $
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.13 2004/11/05 17:11:05 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -589,7 +589,7 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
if (errno != ENOENT)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not unlink file \"%s\": %m",
errmsg("could not remove file \"%s\": %m",
subfile)));
}
@ -614,7 +614,7 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
if (unlink(location) < 0)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not unlink symbolic link \"%s\": %m",
errmsg("could not remove symbolic link \"%s\": %m",
location)));
}

View File

@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.91 2004/10/12 21:54:38 petere Exp $
* $PostgreSQL: pgsql/src/backend/main/main.c,v 1.92 2004/11/05 17:11:17 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -243,7 +243,8 @@ 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\n"
"permitted.\n"
"The server must be started under an unprivileged user ID to prevent\n"
"possible system security compromises. See the documentation for\n"
"more information on how to properly start the server.\n");

View File

@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.10 2004/10/28 00:39:59 tgl Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.11 2004/11/05 17:11:28 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -553,7 +553,7 @@ RequestCheckpoint(bool waitforit)
if (bgs->ckpt_failed != old_failed)
ereport(ERROR,
(errmsg("checkpoint request failed"),
errhint("Consult the postmaster log for details.")));
errhint("Consult the server log for details.")));
}
}

View File

@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.82 2004/09/06 17:56:16 tgl Exp $
* $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.83 2004/11/05 17:11:34 petere Exp $
*
*-------------------------------------------------------------------------
*/
@ -454,7 +454,7 @@ smgr_internal_unlink(RelFileNode rnode, int which, bool isTemp, bool isRedo)
if (!(*(smgrsw[which].smgr_unlink)) (rnode, isRedo))
ereport(WARNING,
(errcode_for_file_access(),
errmsg("could not unlink relation %u/%u/%u: %m",
errmsg("could not remove relation %u/%u/%u: %m",
rnode.spcNode,
rnode.dbNode,
rnode.relNode)));