database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-31 17:02:12 +03:00
Code Activity

Message editing: remove gratuitous variations in message wording, standardize

Browse Source 
terms, add some clarifications, fix some untranslatable attempts at dynamic
message building.
This commit is contained in:
Peter Eisentraut
2003-09-25 06:58:07 +00:00
parent 42013caf64
commit feb4f44d29
159 changed files with 1418 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/storage/buffer/bufmgr.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.140 2003/08/10 19:48:08 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.141 2003/09/25 06:58:01 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -231,14 +231,14 @@ ReadBufferInternal(Relation reln, BlockNumber blockNum,
{
ereport(WARNING,
(errcode(ERRCODE_DATA_CORRUPTED),
errmsg("invalid page header in block %u of \"%s\"; zeroing out page",
errmsg("invalid page header in block %u of relation \"%s\"; zeroing out page",
blockNum, RelationGetRelationName(reln))));
MemSet((char *) MAKE_PTR(bufHdr->data), 0, BLCKSZ);
}
else
ereport(ERROR,
(errcode(ERRCODE_DATA_CORRUPTED),
errmsg("invalid page header in block %u of \"%s\"",
errmsg("invalid page header in block %u of relation \"%s\"",
blockNum, RelationGetRelationName(reln))));
}
}

4
src/backend/storage/file/fd.c
View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.101 2003/08/04 02:40:03 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.102 2003/09/25 06:58:02 petere Exp $
*
* NOTES:
*
@@ -331,7 +331,7 @@ pg_nofile(void)
if ((no_files - RESERVE_FOR_LD) < FD_MINFREE)
ereport(FATAL,
(errcode(ERRCODE_INSUFFICIENT_RESOURCES),
errmsg("insufficient file descriptors available to start backend"),
errmsg("insufficient file descriptors available to start server process"),
errdetail("System allows %ld, we need at least %d.",
no_files, RESERVE_FOR_LD + FD_MINFREE)));

4
src/backend/storage/freespace/freespace.c
View File

@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.21 2003/08/08 21:41:59 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/freespace/freespace.c,v 1.22 2003/09/25 06:58:02 petere Exp $
*
*
* NOTES:
@@ -704,7 +704,7 @@ PrintFreeSpaceMapStatistics(int elevel)
ereport(elevel,
(errmsg("free space map: %d relations, %d pages stored; %.0f total pages needed",
numRels, storedPages, needed),
errdetail("Allocated FSM size: %d relations + %d pages = %.0f KB shared mem.",
errdetail("Allocated FSM size: %d relations + %d pages = %.0f kB shared mem.",
MaxFSMRelations, MaxFSMPages,
(double) FreeSpaceShmemSize() / 1024.0)));
}

4
src/backend/storage/ipc/shmem.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.71 2003/09/21 17:57:21 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.72 2003/09/25 06:58:02 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -380,7 +380,7 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
ereport(WARNING,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("could not allocate \"%s\"", name)));
errmsg("could not allocate shared memory segment \"%s\"", name)));
*foundPtr = FALSE;
return NULL;
}

6
src/backend/storage/lmgr/deadlock.c
View File

@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.24 2003/08/08 21:42:00 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/deadlock.c,v 1.25 2003/09/25 06:58:02 petere Exp $
*
* Interface:
*
@@ -864,7 +864,7 @@ DeadLockReport(void)
{
/* Lock is for transaction ID */
appendStringInfo(&buf,
gettext("Proc %d waits for %s on transaction %u; blocked by proc %d."),
gettext("Process %d waits for %s on transaction %u; blocked by process %d."),
info->pid,
GetLockmodeName(info->lockmode),
info->locktag.objId.xid,
@@ -874,7 +874,7 @@ DeadLockReport(void)
{
/* Lock is for a relation */
appendStringInfo(&buf,
gettext("Proc %d waits for %s on relation %u of database %u; blocked by proc %d."),
gettext("Process %d waits for %s on relation %u of database %u; blocked by process %d."),
info->pid,
GetLockmodeName(info->lockmode),
info->locktag.relId,

18
src/backend/storage/smgr/smgr.c
View File

@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.64 2003/08/04 02:40:04 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.65 2003/09/25 06:58:02 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -173,7 +173,7 @@ smgrcreate(int16 which, Relation reln)
if ((fd = (*(smgrsw[which].smgr_create)) (reln)) < 0)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not create \"%s\": %m",
errmsg("could not create relation \"%s\": %m",
RelationGetRelationName(reln))));
/* Add the relation to the list of stuff to delete at abort */
@@ -248,7 +248,7 @@ smgrextend(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
if (status == SM_FAIL)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not extend \"%s\": %m",
errmsg("could not extend relation \"%s\": %m",
RelationGetRelationName(reln)),
errhint("Check free disk space.")));
@@ -275,7 +275,7 @@ smgropen(int16 which, Relation reln, bool failOK)
if (!failOK)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not open \"%s\": %m",
errmsg("could not open file \"%s\": %m",
RelationGetRelationName(reln))));
return fd;
@@ -292,7 +292,7 @@ smgrclose(int16 which, Relation reln)
if ((*(smgrsw[which].smgr_close)) (reln) == SM_FAIL)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not close \"%s\": %m",
errmsg("could not close relation \"%s\": %m",
RelationGetRelationName(reln))));
return SM_SUCCESS;
@@ -318,7 +318,7 @@ smgrread(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
if (status == SM_FAIL)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not read block %d of \"%s\": %m",
errmsg("could not read block %d of relation \"%s\": %m",
blocknum, RelationGetRelationName(reln))));
return status;
@@ -344,7 +344,7 @@ smgrwrite(int16 which, Relation reln, BlockNumber blocknum, char *buffer)
if (status == SM_FAIL)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not write block %d of \"%s\": %m",
errmsg("could not write block %d of relation \"%s\": %m",
blocknum, RelationGetRelationName(reln))));
return status;
@@ -404,7 +404,7 @@ smgrnblocks(int16 which, Relation reln)
if (nblocks == InvalidBlockNumber)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not count blocks of \"%s\": %m",
errmsg("could not count blocks of relation \"%s\": %m",
RelationGetRelationName(reln))));
return nblocks;
@@ -436,7 +436,7 @@ smgrtruncate(int16 which, Relation reln, BlockNumber nblocks)
if (newblks == InvalidBlockNumber)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not truncate \"%s\" to %u blocks: %m",
errmsg("could not truncate relation \"%s\" to %u blocks: %m",
RelationGetRelationName(reln), nblocks)));
}