diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index 23f706b21da..031b1b5cd58 100644 --- a/contrib/pg_standby/pg_standby.c +++ b/contrib/pg_standby/pg_standby.c @@ -58,7 +58,6 @@ char *triggerPath; /* where to find the trigger file? */ char *xlogFilePath; /* where we are going to restore to */ char *nextWALFileName; /* the file we need to get from archive */ char *restartWALFileName; /* the file from which we can restart restore */ -char *priorWALFileName; /* the file we need to get from archive */ char WALFilePath[MAXPGPATH * 2]; /* the file path including archive */ char restoreCommand[MAXPGPATH]; /* run this to restore */ char exclusiveCleanupFileName[MAXFNAMELEN]; /* the file we need to get diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c index 0984e01a14b..3feadf7b702 100644 --- a/contrib/pgcrypto/pgp-pgsql.c +++ b/contrib/pgcrypto/pgp-pgsql.c @@ -761,7 +761,7 @@ pgp_pub_decrypt_text(PG_FUNCTION_ARGS) */ /* - * Helper function for pgp_armor. Converts arrays of keys and values into + * Helper function for pg_armor. Converts arrays of keys and values into * plain C arrays, and checks that they don't contain invalid characters. */ static int diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h index cef9c4b4565..0d4722a04a0 100644 --- a/contrib/pgcrypto/px.h +++ b/contrib/pgcrypto/px.h @@ -50,9 +50,6 @@ void *px_realloc(void *p, size_t s); void px_free(void *p); #endif -/* max len of 'type' parms */ -#define PX_MAX_NAMELEN 128 - /* max salt returned */ #define PX_MAX_SALT_LEN 128 diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c index fb6a57d917c..64671ac64d9 100644 --- a/contrib/pgcrypto/sha1.c +++ b/contrib/pgcrypto/sha1.c @@ -59,16 +59,6 @@ static uint32 _K[] = {0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6}; #define BCOUNT (ctxt->c.b64[0] / 8) #define W(n) (ctxt->m.b32[(n)]) -#define PUTBYTE(x) \ -do { \ - ctxt->m.b8[(COUNT % 64)] = (x); \ - COUNT++; \ - COUNT %= 64; \ - ctxt->c.b64[0] += 8; \ - if (COUNT % 64 == 0) \ - sha1_step(ctxt); \ -} while (0) - #define PUTPAD(x) \ do { \ ctxt->m.b8[(COUNT % 64)] = (x); \ diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 033aeb2556e..06a205877d7 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -2794,7 +2794,7 @@ estimate_path_cost_size(PlannerInfo *root, /* * Back into an estimate of the number of retrieved rows. Just in - * case this is nuts, clamp to at most nrow. + * case this is nuts, clamp to at most nrows. */ retrieved_rows = clamp_row_est(rows / fpinfo->local_conds_sel); retrieved_rows = Min(retrieved_rows, nrows); diff --git a/contrib/sepgsql/sepgsql.h b/contrib/sepgsql/sepgsql.h index 7197e3cdf03..4787934650a 100644 --- a/contrib/sepgsql/sepgsql.h +++ b/contrib/sepgsql/sepgsql.h @@ -271,7 +271,7 @@ extern void sepgsql_avc_init(void); */ extern char *sepgsql_get_client_label(void); extern void sepgsql_init_client_label(void); -extern char *sepgsql_get_label(Oid relOid, Oid objOid, int32 subId); +extern char *sepgsql_get_label(Oid classId, Oid objectId, int32 subId); extern void sepgsql_object_relabel(const ObjectAddress *object, const char *seclabel); diff --git a/contrib/test_decoding/test_decoding.c b/contrib/test_decoding/test_decoding.c index a0ded67b9aa..6c33c4bdedb 100644 --- a/contrib/test_decoding/test_decoding.c +++ b/contrib/test_decoding/test_decoding.c @@ -24,7 +24,7 @@ PG_MODULE_MAGIC; -/* These must be available to pg_dlsym() */ +/* These must be available to dlsym() */ extern void _PG_init(void); extern void _PG_output_plugin_init(OutputPluginCallbacks *cb); diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index ef2e97afd12..e7295abda28 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -5509,7 +5509,7 @@ int PQendcopy(PGconn *conn); It should either be issued when the last string has been sent to the server using or when the last string has been received from the server using - PGgetline. It must be issued or the server + PQgetline. It must be issued or the server will get out of sync with the client. Upon return from this function, the server is ready to receive the next SQL command. The return value is 0 on successful completion, diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index 0ef6eb9a9c1..9ab0d6af04c 100644 --- a/doc/src/sgml/ref/set_role.sgml +++ b/doc/src/sgml/ref/set_role.sgml @@ -70,7 +70,7 @@ RESET ROLE effectively drops all the privileges assigned directly to the session user and to the other roles it is a member of, leaving only the privileges available to the named role. On the other hand, if the session user role - has the NOINHERITS attribute, SET ROLE drops the + has the NOINHERIT attribute, SET ROLE drops the privileges assigned directly to the session user and instead acquires the privileges available to the named role. diff --git a/doc/src/sgml/sslinfo.sgml b/doc/src/sgml/sslinfo.sgml index 0fde0fc10e0..78ff83d6422 100644 --- a/doc/src/sgml/sslinfo.sgml +++ b/doc/src/sgml/sslinfo.sgml @@ -185,7 +185,7 @@ countryName (alias C) localityName (alias L) stateOrProvinceName (alias ST) organizationName (alias O) -organizationUnitName (alias OU) +organizationalUnitName (alias OU) title description initials diff --git a/src/backend/access/gin/README b/src/backend/access/gin/README index 838fdc0d630..76c12ae2f6b 100644 --- a/src/backend/access/gin/README +++ b/src/backend/access/gin/README @@ -270,7 +270,7 @@ is stored in the higher bits. That requires 43 bits in total, which conveniently fits in at most 6 bytes. A compressed posting list is passed around and stored on disk in a -PackedPostingList struct. The first item in the list is stored uncompressed +GinPostingList struct. The first item in the list is stored uncompressed as a regular ItemPointerData, followed by the length of the list in bytes, followed by the packed items. diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c index 11a8ed7bbc2..4c29261256a 100644 --- a/src/backend/access/gin/ginbtree.c +++ b/src/backend/access/gin/ginbtree.c @@ -650,7 +650,7 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack, } else { - elog(ERROR, "invalid return code from GIN placeToPage method: %d", rc); + elog(ERROR, "invalid return code from GIN beginPlaceToPage method: %d", rc); result = false; /* keep compiler quiet */ } diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 4e0c500a22e..95ac35e3bb3 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -74,7 +74,7 @@ gistkillitems(IndexScanDesc scan) /* * Mark all killedItems as dead. We need no additional recheck, because, - * if page was modified, pageLSN must have changed. + * if page was modified, curPageLSN must have changed. */ for (i = 0; i < so->numKilled; i++) { @@ -379,11 +379,11 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances, /* * Check if the page was deleted after we saw the downlink. There's - * nothing of interest on a deleted page. Note that we must do this - * after checking the NSN for concurrent splits! It's possible that - * the page originally contained some tuples that are visible to us, - * but was split so that all the visible tuples were moved to another - * page, and then this page was deleted. + * nothing of interest on a deleted page. Note that we must do this after + * checking the NSN for concurrent splits! It's possible that the page + * originally contained some tuples that are visible to us, but was split + * so that all the visible tuples were moved to another page, and then + * this page was deleted. */ if (GistPageIsDeleted(page)) { diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c index d7b70981101..86e7210acb8 100644 --- a/src/backend/access/hash/hash_xlog.c +++ b/src/backend/access/hash/hash_xlog.c @@ -706,7 +706,7 @@ hash_xlog_squeeze_page(XLogReaderState *record) /* * if the page on which are adding tuples is a page previous to freed - * overflow page, then update its nextblno. + * overflow page, then update its nextblkno. */ if (xldata->is_prev_bucket_same_wrt) { diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index 5321762d5ea..89876d2ccd0 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -257,8 +257,8 @@ restart_insert: * _hash_pgaddtup() -- add a tuple to a particular page in the index. * * This routine adds the tuple to the page as requested; it does not write out - * the page. It is an error to call pgaddtup() without pin and write lock on - * the target buffer. + * the page. It is an error to call this function without pin and write lock + * on the target buffer. * * Returns the offset number at which the tuple was inserted. This function * is responsible for preserving the condition that tuples in a hash index diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 94309949fac..e33f019939d 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -74,7 +74,7 @@ static HeapTuple heap_prepare_insert(Relation relation, HeapTuple tup, TransactionId xid, CommandId cid, int options); static XLogRecPtr log_heap_update(Relation reln, Buffer oldbuf, Buffer newbuf, HeapTuple oldtup, - HeapTuple newtup, HeapTuple old_key_tup, + HeapTuple newtup, HeapTuple old_key_tuple, bool all_visible_cleared, bool new_all_visible_cleared); static Bitmapset *HeapDetermineModifiedColumns(Relation relation, Bitmapset *interesting_cols, diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c index 64dfe06b261..a08922b0798 100644 --- a/src/backend/access/heap/visibilitymap.c +++ b/src/backend/access/heap/visibilitymap.c @@ -124,7 +124,7 @@ /* prototypes for internal routines */ static Buffer vm_readbuf(Relation rel, BlockNumber blkno, bool extend); -static void vm_extend(Relation rel, BlockNumber nvmblocks); +static void vm_extend(Relation rel, BlockNumber vm_nblocks); /* diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index d0b9013caf4..b30cf9e9898 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -657,7 +657,7 @@ _bt_blwritepage(BTWriteState *wstate, Page page, BlockNumber blkno) /* XLOG stuff */ if (wstate->btws_use_wal) { - /* We use the heap NEWPAGE record type for this */ + /* We use the XLOG_FPI record type for this */ log_newpage(&wstate->index->rd_node, MAIN_FORKNUM, blkno, page, true); } diff --git a/src/backend/access/transam/README b/src/backend/access/transam/README index ad4083eb6b5..b5a2cb2de83 100644 --- a/src/backend/access/transam/README +++ b/src/backend/access/transam/README @@ -530,7 +530,7 @@ void XLogResetInsertion(void) construction workspace. This is only needed if you have already called XLogBeginInsert(), but decide to not insert the record after all. -void XLogEnsureRecordSpace(int max_block_id, int nrdatas) +void XLogEnsureRecordSpace(int max_block_id, int ndatas) Normally, the WAL record construction buffers have the following limits: diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index 34c74d96f8e..595c860aaaf 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -92,7 +92,7 @@ static int ZeroCLOGPage(int pageno, bool writeXlog); static bool CLOGPagePrecedes(int page1, int page2); static void WriteZeroPageXlogRec(int pageno); static void WriteTruncateXlogRec(int pageno, TransactionId oldestXact, - Oid oldestXidDb); + Oid oldestXactDb); static void TransactionIdSetPageStatus(TransactionId xid, int nsubxids, TransactionId *subxids, XidStatus status, XLogRecPtr lsn, int pageno, diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 2e169dd3f92..7b2448e05ba 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -282,7 +282,7 @@ typedef struct MultiXactStateData } MultiXactStateData; /* - * Last element of OldestMemberMXactID and OldestVisibleMXactId arrays. + * Last element of OldestMemberMXactId and OldestVisibleMXactId arrays. * Valid elements are (1..MaxOldestSlot); element 0 is never used. */ #define MaxOldestSlot (MaxBackends + max_prepared_xacts) diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 291412e305b..88ce37c08de 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -4114,7 +4114,7 @@ pg_largeobject_aclmask_snapshot(Oid lobj_oid, Oid roleid, return mask; /* - * Get the largeobject's ACL from pg_language_metadata + * Get the largeobject's ACL from pg_largeobject_metadata */ pg_lo_meta = table_open(LargeObjectMetadataRelationId, AccessShareLock); diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql index 9c21ac7c629..c42e76ea894 100644 --- a/src/backend/catalog/information_schema.sql +++ b/src/backend/catalog/information_schema.sql @@ -48,10 +48,6 @@ CREATE FUNCTION _pg_expandarray(IN anyarray, OUT x anyelement, OUT n int) pg_catalog.array_upper($1,1), 1) as g(s)'; -CREATE FUNCTION _pg_keysequal(smallint[], smallint[]) RETURNS boolean - LANGUAGE sql IMMUTABLE PARALLEL SAFE -- intentionally not STRICT, to allow inlining - AS 'select $1 operator(pg_catalog.<@) $2 and $2 operator(pg_catalog.<@) $1'; - /* Given an index's OID and an underlying-table column number, return the * column's position in the index (NULL if not there) */ CREATE FUNCTION _pg_index_position(oid, smallint) RETURNS int diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index caf48cefa98..ce8a4e927da 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = /* * This struct maps the string object types as returned by - * getObjectTypeDescription into ObjType enum values. Note that some enum + * getObjectTypeDescription into ObjectType enum values. Note that some enum * values can be obtained by different names, and that some string object types * do not have corresponding values in the output enum. The user of this map * must be careful to test for invalid values being returned. diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 4f04d122c30..3aeef30b281 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -176,7 +176,6 @@ typedef struct CopyStateData * Working state for COPY FROM */ AttrNumber num_defaults; - FmgrInfo oid_in_function; FmgrInfo *in_functions; /* array of input functions for each attrs */ Oid *typioparams; /* array of element types for in_functions */ int *defmap; /* array of default att numbers */ diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index b6c618aa00f..9c93e415f14 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -139,7 +139,7 @@ defGetBoolean(DefElem *def) /* * The set of strings accepted here should match up with the - * grammar's opt_boolean production. + * grammar's opt_boolean_or_string production. */ if (pg_strcasecmp(sval, "true") == 0) return true; diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index c12b6137633..7e0a041fabf 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -143,7 +143,7 @@ PrepareQuery(PrepareStmt *stmt, const char *queryString, } /* - * grammar only allows OptimizableStmt, so this check should be redundant + * grammar only allows PreparableStmt, so this check should be redundant */ switch (query->commandType) { diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index e7b379dfda1..046bb047321 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -847,7 +847,7 @@ get_all_vacuum_rels(int options) } /* - * vacuum_set_xid_limits() -- compute oldest-Xmin and freeze cutoff points + * vacuum_set_xid_limits() -- compute oldestXmin and freeze cutoff points * * The output parameters are: * - oldestXmin is the cutoff value used to distinguish whether tuples are diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c index def00cd7c5f..cb813573044 100644 --- a/src/backend/executor/nodeWindowAgg.c +++ b/src/backend/executor/nodeWindowAgg.c @@ -93,7 +93,7 @@ typedef struct WindowStatePerFuncData bool resulttypeByVal; bool plain_agg; /* is it just a plain aggregate function? */ - int aggno; /* if so, index of its PerAggData */ + int aggno; /* if so, index of its WindowStatePerAggData */ WindowObject winobj; /* object used in window function API */ } WindowStatePerFuncData; @@ -142,7 +142,7 @@ typedef struct WindowStatePerAggData resulttypeByVal, transtypeByVal; - int wfuncno; /* index of associated PerFuncData */ + int wfuncno; /* index of associated WindowStatePerFuncData */ /* Context holding transition value and possibly other subsidiary data */ MemoryContext aggcontext; /* may be private, or winstate->aggcontext */ diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 384887e70d9..d8d863dda20 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -44,8 +44,8 @@ * StreamClose - Close a client/backend connection * TouchSocketFiles - Protect socket files against /tmp cleaners * pq_init - initialize libpq at backend startup - * pq_comm_reset - reset libpq during error recovery - * pq_close - shutdown libpq at backend exit + * socket_comm_reset - reset libpq during error recovery + * socket_close - shutdown libpq at backend exit * * low-level I/O: * pq_getbytes - get a known number of bytes from connection diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c index f5d56138ee5..cf4387e40f0 100644 --- a/src/backend/nodes/params.c +++ b/src/backend/nodes/params.c @@ -144,7 +144,7 @@ EstimateParamListSpace(ParamListInfo paramLI) } /* - * Serialize a paramListInfo structure into caller-provided storage. + * Serialize a ParamListInfo structure into caller-provided storage. * * We write the number of parameters first, as a 4-byte integer, and then * write details for each parameter in turn. The details for each parameter diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c index bf534599969..23905a9c352 100644 --- a/src/backend/nodes/tidbitmap.c +++ b/src/backend/nodes/tidbitmap.c @@ -1021,7 +1021,7 @@ tbm_iterate(TBMIterator *iterator) PagetableEntry *page; int ntuples; - /* In ONE_PAGE state, we don't allocate an spages[] array */ + /* In TBM_ONE_PAGE state, we don't allocate an spages[] array */ if (tbm->status == TBM_ONE_PAGE) page = &tbm->entry1; else diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c index f8b75e60918..0a6bacc2f2a 100644 --- a/src/backend/optimizer/geqo/geqo_selection.c +++ b/src/backend/optimizer/geqo/geqo_selection.c @@ -91,7 +91,7 @@ geqo_selection(PlannerInfo *root, Chromosome *momma, Chromosome *daddy, static int linear_rand(PlannerInfo *root, int pool_size, double bias) { - double index; /* index between 0 and pop_size */ + double index; /* index between 0 and pool_size */ double max = (double) pool_size; /* diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 8f51f59f8ac..0f918dd358d 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -4242,7 +4242,7 @@ consider_groupingsets_paths(PlannerInfo *root, * 2) If there are no empty sets and only unsortable sets, then the * rollups list will be empty (and thus l_start == NULL), and * group_pathkeys will be NIL; we must ensure that the vacuously-true - * pathkeys_contain_in test doesn't cause us to crash. + * pathkeys_contained_in test doesn't cause us to crash. */ if (l_start != NULL && pathkeys_contained_in(root->group_pathkeys, path->pathkeys)) @@ -5177,7 +5177,7 @@ make_group_input_target(PlannerInfo *root, PathTarget *final_target) * a regular aggregation node would, plus any aggregates used in HAVING; * except that the Aggref nodes should be marked as partial aggregates. * - * In addition, we'd better emit any Vars and PlaceholderVars that are + * In addition, we'd better emit any Vars and PlaceHolderVars that are * used outside of Aggrefs in the aggregation tlist and HAVING. (Presumably, * these would be Vars that are grouped by or used in grouping expressions.) * diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index 0e1015962d7..20abbb3b55a 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -134,7 +134,7 @@ LookupOperName(ParseState *pstate, List *opername, Oid oprleft, Oid oprright, /* * LookupOperWithArgs * Like LookupOperName, but the argument types are specified by - * a ObjectWithArg node. + * a ObjectWithArgs node. */ Oid LookupOperWithArgs(ObjectWithArgs *oper, bool noError) diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index b4f2b28b517..2bb14cdd026 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -6122,7 +6122,7 @@ pgstat_recv_resetcounter(PgStat_MsgResetcounter *msg, int len) } /* ---------- - * pgstat_recv_resetshared() - + * pgstat_recv_resetsharedcounter() - * * Reset some shared statistics of the cluster. * ---------- diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 8765af71d4d..91078dcd806 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -288,7 +288,6 @@ struct vars #define NWBDRY 'W' /* non-word-boundary constraint */ #define SBEGIN 'A' /* beginning of string (even if not BOL) */ #define SEND 'Z' /* end of string (even if not EOL) */ -#define PREFER 'P' /* length preference */ /* is an arc colored, and hence on a color chain? */ #define COLORED(a) \ diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index e8ffa0492f1..5fa3d7323e9 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -1381,7 +1381,7 @@ ReorderBufferCopySnap(ReorderBuffer *rb, Snapshot orig_snap, snap->subxip[i++] = txn->xid; /* - * nsubxcnt isn't decreased when subtransactions abort, so count manually. + * subxcnt isn't decreased when subtransactions abort, so count manually. * Since it's an upper boundary it is safe to use it for the allocation * above. */ diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index fadab62950d..469aac38c40 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -265,7 +265,6 @@ CreateSharedProcArray(void) &found); } - /* Register and initialize fields of ProcLWLockTranche */ LWLockRegisterTranche(LWTRANCHE_PROC, "proc"); } diff --git a/src/backend/storage/ipc/shm_mq.c b/src/backend/storage/ipc/shm_mq.c index 4c245d1f85e..551515960d1 100644 --- a/src/backend/storage/ipc/shm_mq.c +++ b/src/backend/storage/ipc/shm_mq.c @@ -1251,7 +1251,7 @@ shm_mq_inc_bytes_written(shm_mq *mq, Size n) pg_atomic_read_u64(&mq->mq_bytes_written) + n); } -/* Shim for on_dsm_callback. */ +/* Shim for on_dsm_detach callback. */ static void shm_mq_detach_callback(dsm_segment *seg, Datum arg) { diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 1b7053cb1cf..9089733ecc7 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -996,8 +996,8 @@ LockAcquireExtended(const LOCKTAG *locktag, /* * We can't acquire the lock immediately. If caller specified no - * blocking, remove useless table entries and return NOT_AVAIL without - * waiting. + * blocking, remove useless table entries and return + * LOCKACQUIRE_NOT_AVAIL without waiting. */ if (dontWait) { diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index 2d709420c3d..85a629f4fce 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -364,7 +364,7 @@ static SERIALIZABLEXACT *OldCommittedSxact; * These configuration variables are used to set the predicate lock table size * and to control promotion of predicate locks to coarser granularity in an * attempt to degrade performance (mostly as false positive serialization - * failure) gracefully in the face of memory pressurel + * failure) gracefully in the face of memory pressure. */ int max_predicate_locks_per_xact; /* set by guc.c */ int max_predicate_locks_per_relation; /* set by guc.c */ @@ -4809,7 +4809,7 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader, } /* - * PreCommit_CheckForSerializableConflicts + * PreCommit_CheckForSerializationFailure * Check for dangerous structures in a serializable transaction * at commit. * diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index f5261065305..5d4f26a4901 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -325,7 +325,7 @@ pg_read_binary_file(PG_FUNCTION_ARGS) /* * Wrapper functions for the 1 and 3 argument variants of pg_read_file_v2() - * and pg_binary_read_file(). + * and pg_read_binary_file(). * * These are necessary to pass the sanity check in opr_sanity, which checks * that all built-in functions that share the implementing C function take diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 0c58f1f1096..54816dc0287 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -115,7 +115,7 @@ typedef struct List *windowTList; /* targetlist for resolving WINDOW clause */ int prettyFlags; /* enabling of pretty-print functions */ int wrapColumn; /* max line length, or -1 for no limit */ - int indentLevel; /* current indent level for prettyprint */ + int indentLevel; /* current indent level for pretty-print */ bool varprefix; /* true to print prefixes on Vars */ ParseExprKind special_exprkind; /* set only for exprkinds needing special * handling */ diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c index e23669fb4fb..bd8d2009829 100644 --- a/src/backend/utils/mmgr/slab.c +++ b/src/backend/utils/mmgr/slab.c @@ -40,7 +40,7 @@ * * For each block, we maintain pointer to the first free chunk - this is quite * cheap and allows us to skip all the preceding used chunks, eliminating - * a significant number of lookups in many common usage patters. In the worst + * a significant number of lookups in many common usage patterns. In the worst * case this performs as if the pointer was not maintained. * * We cache the freelist index for the blocks with the fewest free chunks diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index 40fe6ed3d30..47b0517596e 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -1171,7 +1171,7 @@ AtEOXact_Snapshot(bool isCommit, bool resetXmin) /* * During normal commit processing, we call ProcArrayEndTransaction() to - * reset the PgXact->xmin. That call happens prior to the call to + * reset the MyPgXact->xmin. That call happens prior to the call to * AtEOXact_Snapshot(), so we need not touch xmin here at all. */ if (resetXmin) diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 09eabfbe5ab..9c303e9cc47 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -1295,7 +1295,7 @@ setup_config(void) err = WSAStartup(MAKEWORD(2, 2), &wsaData); #endif - /* for best results, this code should match parse_hba() */ + /* for best results, this code should match parse_hba_line() */ hints.ai_flags = AI_NUMERICHOST; hints.ai_family = AF_UNSPEC; hints.ai_socktype = 0; diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index ccf2153fac4..dfba58ac587 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -18,10 +18,6 @@ #define oidcmp(x,y) ( ((x) < (y) ? -1 : ((x) > (y)) ? 1 : 0) ) -#define oideq(x,y) ( (x) == (y) ) -#define oidle(x,y) ( (x) <= (y) ) -#define oidge(x,y) ( (x) >= (y) ) -#define oidzero(x) ( (x) == 0 ) /* * The data structures used to store system catalog information. Every diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index f9b1ae6809d..40a6b3745cb 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -54,8 +54,6 @@ static void usage(const char *progname); -typedef struct option optType; - int main(int argc, char **argv) { diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c index 9d9c33d78c3..74063ebf2f9 100644 --- a/src/bin/pg_resetwal/pg_resetwal.c +++ b/src/bin/pg_resetwal/pg_resetwal.c @@ -934,8 +934,8 @@ RewriteControlFile(void) * * On entry, ControlFile.checkPointCopy.redo and ControlFile.xlog_seg_size * are assumed valid (note that we allow the old xlog seg size to differ - * from what we're using). On exit, newXlogId and newXlogSeg are set to - * suitable values for the beginning of replacement WAL (in our seg size). + * from what we're using). On exit, newXlogSegNo is set to suitable + * value for the beginning of replacement WAL (in our seg size). */ static void FindEndOfXLOG(void) diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index 17736c37827..b50c7d209ca 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -31,7 +31,7 @@ extern bool describeOperators(const char *pattern, bool verbose, bool showSystem extern bool describeRoles(const char *pattern, bool verbose, bool showSystem); /* \drds */ -extern bool listDbRoleSettings(const char *pattern1, const char *pattern2); +extern bool listDbRoleSettings(const char *pattern, const char *pattern2); /* \z (or \dp) */ extern bool permissionsList(const char *pattern); diff --git a/src/common/unicode/norm_test.c b/src/common/unicode/norm_test.c index 421dd4e68ea..fee58a184aa 100644 --- a/src/common/unicode/norm_test.c +++ b/src/common/unicode/norm_test.c @@ -66,7 +66,7 @@ main(int argc, char **argv) if (pg_wcscmp(test->output, result) != 0) { - printf("FAILURE (Normalizationdata.txt line %d):\n", test->linenum); + printf("FAILURE (NormalizationTest.txt line %d):\n", test->linenum); printf("input:\t%s\n", print_wchar_str(test->input)); printf("expected:\t%s\n", print_wchar_str(test->output)); printf("got\t%s\n", print_wchar_str(result)); diff --git a/src/include/access/commit_ts.h b/src/include/access/commit_ts.h index e22bfbf3e62..1433aa3ff7a 100644 --- a/src/include/access/commit_ts.h +++ b/src/include/access/commit_ts.h @@ -35,7 +35,7 @@ extern Size CommitTsShmemSize(void); extern void CommitTsShmemInit(void); extern void BootStrapCommitTs(void); extern void StartupCommitTs(void); -extern void CommitTsParameterChange(bool xlrecvalue, bool pgcontrolvalue); +extern void CommitTsParameterChange(bool newvalue, bool oldvalue); extern void CompleteCommitTsInitialization(void); extern void ShutdownCommitTs(void); extern void CheckPointCommitTs(void); diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h index afb3e157216..78fcd826f18 100644 --- a/src/include/access/gin_private.h +++ b/src/include/access/gin_private.h @@ -54,7 +54,7 @@ typedef struct GinState bool oneCol; /* true if single-column index */ /* - * origTupDesc is the nominal tuple descriptor of the index, ie, the i'th + * origTupdesc is the nominal tuple descriptor of the index, ie, the i'th * attribute shows the key type (not the input data type!) of the i'th * index column. In a single-column index this describes the actual leaf * index tuples. In a multi-column index, the actual leaf tuples contain @@ -443,7 +443,7 @@ extern void ginInsertCleanup(GinState *ginstate, bool full_clean, /* ginpostinglist.c */ -extern GinPostingList *ginCompressPostingList(const ItemPointer ptrs, int nptrs, +extern GinPostingList *ginCompressPostingList(const ItemPointer ipd, int nipd, int maxsize, int *nwritten); extern int ginPostingListDecodeAllSegmentsToTbm(GinPostingList *ptr, int totalsize, TIDBitmap *tbm); diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 107c3d01ae4..0d49f4253c5 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -252,7 +252,7 @@ typedef struct HashMetaPageData uint32 hashm_maxbucket; /* ID of maximum bucket in use */ uint32 hashm_highmask; /* mask to modulo into entire table */ uint32 hashm_lowmask; /* mask to modulo into lower half of table */ - uint32 hashm_ovflpoint; /* splitpoint from which ovflpgs being + uint32 hashm_ovflpoint; /* splitpoint from which ovflpage being * allocated */ uint32 hashm_firstfree; /* lowest-number free ovflpage (bit#) */ uint32 hashm_nmaps; /* number of bitmap pages */ diff --git a/src/include/access/nbtxlog.h b/src/include/access/nbtxlog.h index 9beccc86eaf..afa614da252 100644 --- a/src/include/access/nbtxlog.h +++ b/src/include/access/nbtxlog.h @@ -259,4 +259,4 @@ extern void btree_desc(StringInfo buf, XLogReaderState *record); extern const char *btree_identify(uint8 info); extern void btree_mask(char *pagedata, BlockNumber blkno); -#endif /* NBXLOG_H */ +#endif /* NBTXLOG_H */ diff --git a/src/include/access/xloginsert.h b/src/include/access/xloginsert.h index df24089ea45..eeb0412b662 100644 --- a/src/include/access/xloginsert.h +++ b/src/include/access/xloginsert.h @@ -42,7 +42,7 @@ extern void XLogBeginInsert(void); extern void XLogSetRecordFlags(uint8 flags); extern XLogRecPtr XLogInsert(RmgrId rmid, uint8 info); -extern void XLogEnsureRecordSpace(int nbuffers, int ndatas); +extern void XLogEnsureRecordSpace(int max_block_id, int ndatas); extern void XLogRegisterData(char *data, int len); extern void XLogRegisterBuffer(uint8 block_id, Buffer buffer, uint8 flags); extern void XLogRegisterBlock(uint8 block_id, RelFileNode *rnode, diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 507b082acb4..80def7d4014 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -25,8 +25,8 @@ * * The rule for developers is: if you commit a change that requires * an initdb, you should update the catalog version number (as well as - * notifying the pghackers mailing list, which has been the informal - * practice for a long time). + * notifying the pgsql-hackers mailing list, which has been the + * informal practice for a long time). * * The catalog version number is placed here since modifying files in * include/catalog is the most common kind of initdb-forcing change. diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h index c724430aeca..02fc17d7c09 100644 --- a/src/include/commands/extension.h +++ b/src/include/commands/extension.h @@ -43,7 +43,7 @@ extern ObjectAddress InsertExtensionTuple(const char *extName, Oid extOwner, extern ObjectAddress ExecAlterExtensionStmt(ParseState *pstate, AlterExtensionStmt *stmt); extern ObjectAddress ExecAlterExtensionContentsStmt(AlterExtensionContentsStmt *stmt, - ObjectAddress *objAddress); + ObjectAddress *objAddr); extern Oid get_extension_oid(const char *extname, bool missing_ok); extern char *get_extension_name(Oid ext_oid); diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index ac2bfaff1e4..9c25a805f29 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -87,7 +87,7 @@ extern void RangeVarCallbackOwnsTable(const RangeVar *relation, Oid relId, Oid oldRelId, void *arg); extern void RangeVarCallbackOwnsRelation(const RangeVar *relation, - Oid relId, Oid oldRelId, void *noCatalogs); + Oid relId, Oid oldRelId, void *arg); extern bool PartConstraintImpliedByRelConstraint(Relation scanrel, List *partConstraint); diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h index 8e7f7c3d137..d21dbead0a2 100644 --- a/src/include/executor/execExpr.h +++ b/src/include/executor/execExpr.h @@ -576,7 +576,7 @@ typedef struct ExprEvalStep /* for EEOP_WINDOW_FUNC */ struct { - /* out-of-line state, modified by nodeWindowFunc.c */ + /* out-of-line state, modified by nodeWindowAgg.c */ WindowFuncExprState *wfstate; } window_func; diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 0339b98041d..3e3e6c470e9 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -289,7 +289,7 @@ typedef enum pg_enc #define PG_ENCODING_BE_LAST PG_KOI8U /* - * Please use these tests before access to pg_encconv_tbl[] + * Please use these tests before access to pg_enc2name_tbl[] * or to other places... */ #define PG_VALID_BE_ENCODING(_enc) \ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index d1ec2d97f21..5a3b287eaf0 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -11,8 +11,8 @@ * *------------------------------------------------------------------------- */ -#ifndef PARSER_FUNC_H -#define PARSER_FUNC_H +#ifndef PARSE_FUNC_H +#define PARSE_FUNC_H #include "catalog/namespace.h" #include "parser/parse_node.h" diff --git a/src/include/port/atomics.h b/src/include/port/atomics.h index f93009eff57..fab66f8e987 100644 --- a/src/include/port/atomics.h +++ b/src/include/port/atomics.h @@ -178,7 +178,7 @@ pg_atomic_init_flag(volatile pg_atomic_flag *ptr) } /* - * pg_atomic_test_and_set_flag - TAS() + * pg_atomic_test_set_flag - TAS() * * Returns true if the flag has successfully been set, false otherwise. * diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index 7eb274adac9..d73eed585e6 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -22,8 +22,8 @@ * * This is a pointer to an item within a disk page of a known file * (for example, a cross-link from an index to its parent table). - * blkid tells us which block, posid tells us which entry in the linp - * (ItemIdData) array we want. + * ip_blkid tells us which block, ip_posid tells us which entry in + * the linp (ItemIdData) array we want. * * Note: because there is an item pointer in each tuple header and index * tuple header on disk, it's very important not to waste space with diff --git a/src/include/storage/off.h b/src/include/storage/off.h index 82655d1466a..02e663f6ed7 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -26,7 +26,6 @@ typedef uint16 OffsetNumber; #define InvalidOffsetNumber ((OffsetNumber) 0) #define FirstOffsetNumber ((OffsetNumber) 1) #define MaxOffsetNumber ((OffsetNumber) (BLCKSZ / sizeof(ItemIdData))) -#define OffsetNumberMask (0xffff) /* valid uint16 bits */ /* ---------------- * support macros diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index ac7ee72952e..281e1db7259 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -332,4 +332,4 @@ extern PGPROC *AuxiliaryPidGetProc(int pid); extern void BecomeLockGroupLeader(void); extern bool BecomeLockGroupMember(PGPROC *leader, int pid); -#endif /* PROC_H */ +#endif /* _PROC_H_ */ diff --git a/src/include/utils/jsonapi.h b/src/include/utils/jsonapi.h index 5f4d479a7b2..1c56acca55a 100644 --- a/src/include/utils/jsonapi.h +++ b/src/include/utils/jsonapi.h @@ -94,7 +94,7 @@ typedef struct JsonSemAction } JsonSemAction; /* - * parse_json will parse the string in the lex calling the + * pg_parse_json will parse the string in the lex calling the * action functions in sem at the appropriate points. It is * up to them to keep what state they need in semstate. If they * need access to the state of the lexer, then its pointer diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index 4e2016c7aea..de5c43a4602 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -2062,8 +2062,9 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator, /*------ * create a list of variables * - * The variables are listed with input variables preceding outputvariables - * The end of each group is marked by an end marker. per variable we list: + * The variables are listed with input variables preceding output + * variables. The end of each group is marked by an end marker. + * Per variable we list: * * type - as defined in ecpgtype.h * value - where to store the data diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c index 53fcd2157fa..9ee460b9a1f 100644 --- a/src/interfaces/ecpg/pgtypeslib/datetime.c +++ b/src/interfaces/ecpg/pgtypeslib/datetime.c @@ -623,7 +623,7 @@ PGTYPESdate_defmt_asc(date * d, const char *fmt, const char *str) /* * evil[tm] hack: if we read the pgtypes_date_months and haven't - * found a match, reset list to point to pgtypes_date_months_short + * found a match, reset list to point to months (abbreviations) * and reset the counter variable i */ if (list == pgtypes_date_months) diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index a329ebbf93a..d262b57021d 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -3732,8 +3732,8 @@ internal_ping(PGconn *conn) * PQPING_NO_RESPONSE. This result could be somewhat misleading for a * pre-7.4 server, since it won't send back a SQLSTATE, but those are long * out of support. Another corner case where the server could return a - * failure without a SQLSTATE is fork failure, but NO_RESPONSE isn't - * totally unreasonable for that anyway. We expect that every other + * failure without a SQLSTATE is fork failure, but PQPING_NO_RESPONSE + * isn't totally unreasonable for that anyway. We expect that every other * failure case in a modern server will produce a report with a SQLSTATE. * * NOTE: whenever we get around to making libpq generate SQLSTATEs for diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 48d4ebdd96c..b3c59a09923 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -3291,7 +3291,7 @@ PQflush(PGconn *conn) * PQfreemem - safely frees memory allocated * * Needed mostly by Win32, unless multithreaded DLL (/MD in VC6) - * Used for freeing memory from PQescapeByte()a/PQunescapeBytea() + * Used for freeing memory from PQescapeBytea()/PQunescapeBytea() */ void PQfreemem(void *ptr) diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 2d44845ccb2..18fec4a1731 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -7,7 +7,7 @@ * miscellaneous useful functions * * The communication routines here are analogous to the ones in - * backend/libpq/pqcomm.c and backend/libpq/pqcomprim.c, but operate + * backend/libpq/pqcomm.c and backend/libpq/pqformat.c, but operate * in the considerably different environment of the frontend libpq. * In particular, we work with a bare nonblock-mode socket, rather than * a stdio stream, so that we can avoid unwanted blocking of the application. diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 26198fc1de4..3151975564a 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -565,10 +565,10 @@ extern void PQdisplayTuples(const PGresult *res, extern void PQprintTuples(const PGresult *res, FILE *fout, /* output stream */ - int printAttName, /* print attribute names */ - int terseOutput, /* delimiter bars */ - int width); /* width of column, if 0, use variable - * width */ + int PrintAttNames, /* print attribute names */ + int TerseOutput, /* delimiter bars */ + int colWidth); /* width of column, if 0, use + * variable width */ /* === in fe-lobj.c === */ diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index fcf2bc2cab3..d37bb3ce404 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -169,7 +169,7 @@ struct pg_result int ntups; int numAttributes; PGresAttDesc *attDescs; - PGresAttValue **tuples; /* each PGresTuple is an array of + PGresAttValue **tuples; /* each PGresult tuple is an array of * PGresAttValue's */ int tupArrSize; /* allocated size of tuples array */ int numParameters; @@ -232,7 +232,8 @@ typedef enum PGQUERY_DESCRIBE /* Describe Statement or Portal */ } PGQueryClass; -/* PGSetenvStatusType defines the state of the PQSetenv state machine */ +/* PGSetenvStatusType defines the state of the pqSetenv state machine */ + /* (this is used only for 2.0-protocol connections) */ typedef enum { diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index 30c7e967dfa..30246c53294 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -2452,7 +2452,7 @@ delete_function(PLpgSQL_function *func) plpgsql_free_function_memory(func); } -/* exported so we can call it from plpgsql_init() */ +/* exported so we can call it from _PG_init() */ void plpgsql_HashTableInit(void) { diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h index a5a5ef9de70..8b32075df01 100644 --- a/src/pl/plpgsql/src/plpgsql.h +++ b/src/pl/plpgsql/src/plpgsql.h @@ -685,7 +685,7 @@ typedef struct PLpgSQL_stmt_fori /* * PLpgSQL_stmt_forq represents a FOR statement running over a SQL query. * It is the common supertype of PLpgSQL_stmt_fors, PLpgSQL_stmt_forc - * and PLpgSQL_dynfors. + * and PLpgSQL_stmt_dynfors. */ typedef struct PLpgSQL_stmt_forq { diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c index 50b07cad820..6e08c03fcdb 100644 --- a/src/pl/plpython/plpy_procedure.c +++ b/src/pl/plpython/plpy_procedure.c @@ -471,7 +471,7 @@ PLy_procedure_munge_source(const char *name, const char *src) *mp = '\0'; if (mp > (mrc + mlen)) - elog(FATAL, "buffer overrun in PLy_munge_source"); + elog(FATAL, "buffer overrun in PLy_procedure_munge_source"); return mrc; } diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile index c3c8280ea23..dc22e5ca9d4 100644 --- a/src/test/isolation/Makefile +++ b/src/test/isolation/Makefile @@ -55,7 +55,7 @@ installcheck: all check: all $(pg_isolation_regress_check) --schedule=$(srcdir)/isolation_schedule -# Versions of the check tests that include the prepared_transactions test +# Versions of the check tests that include the prepared-transactions test # It only makes sense to run these if set up to use prepared transactions, # via TEMP_CONFIG for the check case, or via the postgresql.conf for the # installcheck case. diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm index 0d3554659b0..b5d1dc6e89a 100644 --- a/src/tools/msvc/Project.pm +++ b/src/tools/msvc/Project.pm @@ -230,8 +230,7 @@ sub AddDir if ($filter eq "LIBOBJS") { no warnings qw(once); - if (grep(/$p/, @main::pgportfiles, @main::pgcommonfiles) - == 1) + if (grep(/$p/, @main::pgportfiles) == 1) { $p =~ s/\.c/\.o/; $matches .= $p . " ";