From 8a8fbe7e799cfc0d8dc5ffef5640df6dac8acd6c Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 19 Jun 2011 00:37:30 +0300 Subject: [PATCH] Capitalization fixes --- doc/src/sgml/config.sgml | 2 +- doc/src/sgml/libpq.sgml | 4 ++-- doc/src/sgml/plpgsql.sgml | 2 +- doc/src/sgml/spi.sgml | 4 ++-- doc/src/sgml/storage.sgml | 2 +- src/backend/bootstrap/bootparse.y | 2 +- src/backend/port/ipc_test.c | 2 +- src/backend/port/win32/signal.c | 4 ++-- src/backend/storage/buffer/bufmgr.c | 6 +++--- src/backend/storage/ipc/sinvaladt.c | 2 +- src/backend/storage/lmgr/proc.c | 2 +- src/backend/storage/smgr/smgrtype.c | 2 +- src/backend/utils/cache/inval.c | 2 +- src/backend/utils/cache/syscache.c | 8 ++++---- src/backend/utils/init/postinit.c | 2 +- src/interfaces/ecpg/ecpglib/execute.c | 2 +- src/test/examples/testlibpq2.c | 2 +- src/test/regress/pg_regress.c | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index e835e4bc90..794aef4e6a 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -259,7 +259,7 @@ SET ENABLE_SEQSCAN TO OFF; - Specifies the name of an additional process-id (PID) file that the + Specifies the name of an additional process-ID (PID) file that the server should create for use by server administration programs. This parameter can only be set at server start. diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index b359000ab3..3a57295bd3 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -6116,7 +6116,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough) break; } - /* unknown event id, just return TRUE. */ + /* unknown event ID, just return TRUE. */ default: break; } @@ -7553,7 +7553,7 @@ main(int argc, char **argv) while ((notify = PQnotifies(conn)) != NULL) { fprintf(stderr, - "ASYNC NOTIFY of '%s' received from backend pid %d\n", + "ASYNC NOTIFY of '%s' received from backend PID %d\n", notify->relname, notify->be_pid); PQfreemem(notify); nnotifies++; diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml index eea6ec58e3..20bc991083 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -3174,7 +3174,7 @@ RAISE NOTICE 'Calling cs_create_job(%)', v_job_id; and hint: RAISE EXCEPTION 'Nonexistent ID --> %', user_id - USING HINT = 'Please check your user id'; + USING HINT = 'Please check your user ID'; diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml index 512c96f9bd..0d65c78b08 100644 --- a/doc/src/sgml/spi.sgml +++ b/doc/src/sgml/spi.sgml @@ -1231,7 +1231,7 @@ Oid SPI_getargtypeid(SPIPlanPtr plan, int argI SPI_getargtypeid returns the OID representing the type - id for the argIndex'th argument of a plan prepared by + for the argIndex'th argument of a plan prepared by SPI_prepare. First argument is at index zero. @@ -1263,7 +1263,7 @@ Oid SPI_getargtypeid(SPIPlanPtr plan, int argI Return Value - The type id of the argument at the given index. + The type OID of the argument at the given index. If the plan is NULL or invalid, or argIndex is less than 0 or not less than the number of arguments declared for the diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml index 90c3e061b2..0a133bb7c7 100644 --- a/doc/src/sgml/storage.sgml +++ b/doc/src/sgml/storage.sgml @@ -121,7 +121,7 @@ last started with postmaster.pid - A lock file recording the current postmaster process id (PID), + A lock file recording the current postmaster process ID (PID), cluster data directory path, postmaster start timestamp, port number, diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index a9d2428698..f3e85aa31b 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -248,7 +248,7 @@ Boot_CreateStmt: (Datum) 0, false, true); - elog(DEBUG4, "relation created with oid %u", id); + elog(DEBUG4, "relation created with OID %u", id); } do_end(); } diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c index b4bcf40a7a..88b1b57549 100644 --- a/src/backend/port/ipc_test.c +++ b/src/backend/port/ipc_test.c @@ -303,7 +303,7 @@ main(int argc, char **argv) proc_exit(1); } - printf("forked child pid %d OK\n", cpid); + printf("forked child PID %d OK\n", cpid); if (storage->flag != 1234) printf("Wrong value found in shared memory!\n"); diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c index b5675ec76f..92082a20b7 100644 --- a/src/backend/port/win32/signal.c +++ b/src/backend/port/win32/signal.c @@ -171,7 +171,7 @@ pqsignal(int signum, pqsigfunc handler) return prevfunc; } -/* Create the signal listener pipe for specified pid */ +/* Create the signal listener pipe for specified PID */ HANDLE pgwin32_create_signal_listener(pid_t pid) { @@ -186,7 +186,7 @@ pgwin32_create_signal_listener(pid_t pid) if (pipe == INVALID_HANDLE_VALUE) ereport(ERROR, - (errmsg("could not create signal listener pipe for pid %d: error code %d", + (errmsg("could not create signal listener pipe for PID %d: error code %d", (int) pid, (int) GetLastError()))); return pipe; diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index b12348b39d..5eb6186343 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -952,7 +952,7 @@ MarkBufferDirty(Buffer buffer) volatile BufferDesc *bufHdr; if (!BufferIsValid(buffer)) - elog(ERROR, "bad buffer id: %d", buffer); + elog(ERROR, "bad buffer ID: %d", buffer); if (BufferIsLocal(buffer)) { @@ -2198,7 +2198,7 @@ ReleaseBuffer(Buffer buffer) volatile BufferDesc *bufHdr; if (!BufferIsValid(buffer)) - elog(ERROR, "bad buffer id: %d", buffer); + elog(ERROR, "bad buffer ID: %d", buffer); ResourceOwnerForgetBuffer(CurrentResourceOwner, buffer); @@ -2270,7 +2270,7 @@ SetBufferCommitInfoNeedsSave(Buffer buffer) volatile BufferDesc *bufHdr; if (!BufferIsValid(buffer)) - elog(ERROR, "bad buffer id: %d", buffer); + elog(ERROR, "bad buffer ID: %d", buffer); if (BufferIsLocal(buffer)) { diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c index 1df20c4732..4f446aab7a 100644 --- a/src/backend/storage/ipc/sinvaladt.c +++ b/src/backend/storage/ipc/sinvaladt.c @@ -323,7 +323,7 @@ SharedInvalBackendInit(bool sendOnly) /* register exit routine to mark my entry inactive at exit */ on_shmem_exit(CleanupInvalidationState, PointerGetDatum(segP)); - elog(DEBUG4, "my backend id is %d", MyBackendId); + elog(DEBUG4, "my backend ID is %d", MyBackendId); } /* diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index f898b795d5..dd3e47c6b4 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -996,7 +996,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable) { int pid = autovac->pid; - elog(DEBUG2, "sending cancel to blocking autovacuum pid = %d", + elog(DEBUG2, "sending cancel to blocking autovacuum PID %d", pid); /* don't hold the lock across the kill() syscall */ diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c index ec3292afcd..ea7bf496da 100644 --- a/src/backend/storage/smgr/smgrtype.c +++ b/src/backend/storage/smgr/smgrtype.c @@ -54,7 +54,7 @@ smgrout(PG_FUNCTION_ARGS) char *s; if (i >= NStorageManagers || i < 0) - elog(ERROR, "invalid storage manager id: %d", i); + elog(ERROR, "invalid storage manager ID: %d", i); s = pstrdup(StorageManager[i].smgr_name); PG_RETURN_CSTRING(s); diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index ebc83440de..a5580bd92f 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -529,7 +529,7 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg) RelationMapInvalidate(false); } else - elog(FATAL, "unrecognized SI message id: %d", msg->id); + elog(FATAL, "unrecognized SI message ID: %d", msg->id); } /* diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 75f510c164..99e5f1d9fe 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -14,7 +14,7 @@ * These routines allow the parser/planner/executor to perform * rapid lookups on the contents of the system catalogs. * - * see utils/syscache.h for a list of the cache id's + * see utils/syscache.h for a list of the cache IDs * *------------------------------------------------------------------------- */ @@ -842,7 +842,7 @@ SearchSysCache(int cacheId, { if (cacheId < 0 || cacheId >= SysCacheSize || !PointerIsValid(SysCache[cacheId])) - elog(ERROR, "invalid cache id: %d", cacheId); + elog(ERROR, "invalid cache ID: %d", cacheId); return SearchCatCache(SysCache[cacheId], key1, key2, key3, key4); } @@ -1026,7 +1026,7 @@ SysCacheGetAttr(int cacheId, HeapTuple tup, */ if (cacheId < 0 || cacheId >= SysCacheSize || !PointerIsValid(SysCache[cacheId])) - elog(ERROR, "invalid cache id: %d", cacheId); + elog(ERROR, "invalid cache ID: %d", cacheId); if (!PointerIsValid(SysCache[cacheId]->cc_tupdesc)) { InitCatCachePhase2(SysCache[cacheId], false); @@ -1047,7 +1047,7 @@ SearchSysCacheList(int cacheId, int nkeys, { if (cacheId < 0 || cacheId >= SysCacheSize || !PointerIsValid(SysCache[cacheId])) - elog(ERROR, "invalid cache id: %d", cacheId); + elog(ERROR, "invalid cache ID: %d", cacheId); return SearchCatCacheList(SysCache[cacheId], nkeys, key1, key2, key3, key4); diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 8347f52ca8..1476df4db2 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -489,7 +489,7 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username, SharedInvalBackendInit(false); if (MyBackendId > MaxBackends || MyBackendId <= 0) - elog(FATAL, "bad backend id: %d", MyBackendId); + elog(FATAL, "bad backend ID: %d", MyBackendId); /* Now that we have a BackendId, we can participate in ProcSignal */ ProcSignalInit(MyBackendId); diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index 970fa93509..81c1165ce2 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -1698,7 +1698,7 @@ ecpg_execute(struct statement * stmt) notify = PQnotifies(stmt->connection->connection); if (notify) { - ecpg_log("ecpg_execute on line %d: asynchronous notification of \"%s\" from backend pid %d received\n", + ecpg_log("ecpg_execute on line %d: asynchronous notification of \"%s\" from backend PID %d received\n", stmt->lineno, notify->relname, notify->be_pid); PQfreemem(notify); } diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c index f47c5e36bb..850993f6e8 100644 --- a/src/test/examples/testlibpq2.c +++ b/src/test/examples/testlibpq2.c @@ -121,7 +121,7 @@ main(int argc, char **argv) while ((notify = PQnotifies(conn)) != NULL) { fprintf(stderr, - "ASYNC NOTIFY of '%s' received from backend pid %d\n", + "ASYNC NOTIFY of '%s' received from backend PID %d\n", notify->relname, notify->be_pid); PQfreemem(notify); nnotifies++; diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 9fc9c1088f..1c5c176e1f 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -2310,7 +2310,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc #else #define ULONGPID(x) (unsigned long) (x) #endif - printf(_("running on port %d with pid %lu\n"), + printf(_("running on port %d with PID %lu\n"), port, ULONGPID(postmaster_pid)); } else -- 2.11.0