From 26f68149bbd643d5e4319c4d072a60fc6625125e Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Sat, 3 Sep 2022 16:48:24 -0700 Subject: [PATCH v3 6/6] Harmonize parameter names in miscellaneous code. --- src/include/access/genam.h | 9 ++- src/include/access/generic_xlog.h | 2 +- src/include/access/gin_private.h | 10 +-- src/include/access/gist_private.h | 18 ++--- src/include/access/reloptions.h | 12 +-- src/include/access/tupconvert.h | 2 +- src/include/access/tupdesc.h | 2 +- src/include/access/twophase.h | 2 +- src/include/access/xact.h | 8 +- src/include/access/xlog.h | 8 +- src/include/access/xloginsert.h | 8 +- src/include/access/xlogreader.h | 2 +- src/include/access/xlogrecovery.h | 4 +- src/include/access/xlogutils.h | 4 +- src/include/bootstrap/bootstrap.h | 4 +- src/include/catalog/dependency.h | 6 +- src/include/catalog/index.h | 4 +- src/include/catalog/namespace.h | 2 +- src/include/catalog/objectaccess.h | 12 +-- src/include/catalog/objectaddress.h | 4 +- src/include/catalog/pg_conversion.h | 2 +- src/include/catalog/pg_inherits.h | 5 +- src/include/catalog/pg_publication.h | 2 +- src/include/commands/alter.h | 2 +- src/include/commands/conversioncmds.h | 2 +- src/include/commands/copy.h | 6 +- src/include/commands/dbcommands_xlog.h | 4 +- src/include/commands/matview.h | 2 +- src/include/commands/policy.h | 2 +- src/include/commands/publicationcmds.h | 2 +- src/include/commands/schemacmds.h | 4 +- src/include/commands/seclabel.h | 2 +- src/include/commands/sequence.h | 8 +- src/include/commands/tablecmds.h | 2 +- src/include/commands/tablespace.h | 4 +- src/include/commands/trigger.h | 14 ++-- src/include/commands/typecmds.h | 2 +- src/include/common/fe_memutils.h | 4 +- src/include/common/kwlookup.h | 2 +- src/include/common/scram-common.h | 2 +- src/include/executor/execParallel.h | 4 +- src/include/executor/executor.h | 6 +- src/include/executor/nodeIncrementalSort.h | 2 +- src/include/executor/spi.h | 2 +- src/include/fe_utils/cancel.h | 2 +- src/include/fe_utils/mbprint.h | 3 +- src/include/fe_utils/parallel_slot.h | 2 +- src/include/fe_utils/recovery_gen.h | 2 +- src/include/fe_utils/simple_list.h | 2 +- src/include/fe_utils/string_utils.h | 2 +- src/include/foreign/foreign.h | 5 +- src/include/funcapi.h | 2 +- src/include/libpq/pqmq.h | 2 +- src/include/mb/pg_wchar.h | 6 +- src/include/miscadmin.h | 2 +- src/include/nodes/extensible.h | 4 +- src/include/nodes/nodes.h | 2 +- src/include/nodes/params.h | 4 +- src/include/nodes/pg_list.h | 4 +- src/include/nodes/value.h | 2 +- src/include/optimizer/appendinfo.h | 2 +- src/include/optimizer/clauses.h | 4 +- src/include/optimizer/cost.h | 2 +- src/include/optimizer/paths.h | 4 +- src/include/optimizer/planmain.h | 2 +- src/include/optimizer/prep.h | 2 +- src/include/parser/analyze.h | 2 +- src/include/parser/parse_agg.h | 2 +- src/include/parser/parse_oper.h | 4 +- src/include/parser/parse_relation.h | 2 +- src/include/partitioning/partbounds.h | 4 +- src/include/pgstat.h | 10 +-- src/include/pgtime.h | 4 +- src/include/port.h | 8 +- src/include/postmaster/bgworker.h | 2 +- src/include/postmaster/syslogger.h | 2 +- src/include/replication/logical.h | 2 +- src/include/replication/logicalproto.h | 6 +- src/include/replication/origin.h | 4 +- src/include/replication/slot.h | 2 +- src/include/replication/walsender.h | 2 +- src/include/rewrite/rewriteManip.h | 2 +- src/include/snowball/libstemmer/header.h | 2 +- .../statistics/extended_stats_internal.h | 2 +- src/include/statistics/statistics.h | 4 +- src/include/storage/barrier.h | 2 +- src/include/storage/bufpage.h | 4 +- src/include/storage/dsm.h | 4 +- src/include/storage/fd.h | 14 ++-- src/include/storage/fsm_internals.h | 2 +- src/include/storage/indexfsm.h | 4 +- src/include/storage/lwlock.h | 2 +- src/include/storage/predicate.h | 2 +- src/include/storage/procarray.h | 2 +- src/include/storage/standby.h | 2 +- src/include/tcop/cmdtag.h | 2 +- src/include/tsearch/ts_utils.h | 4 +- src/include/utils/acl.h | 6 +- src/include/utils/attoptcache.h | 2 +- src/include/utils/builtins.h | 8 +- src/include/utils/datetime.h | 2 +- src/include/utils/multirangetypes.h | 6 +- src/include/utils/numeric.h | 2 +- src/include/utils/pgstat_internal.h | 4 +- src/include/utils/rangetypes.h | 4 +- src/include/utils/regproc.h | 2 +- src/include/utils/relcache.h | 2 +- src/include/utils/relmapper.h | 2 +- src/include/utils/selfuncs.h | 4 +- src/include/utils/snapmgr.h | 2 +- src/include/utils/timestamp.h | 4 +- src/include/utils/tuplesort.h | 2 +- src/include/utils/xml.h | 2 +- src/backend/access/brin/brin_minmax_multi.c | 3 +- src/backend/access/common/reloptions.c | 12 +-- src/backend/access/gist/gistbuild.c | 5 +- src/backend/access/gist/gistbuildbuffers.c | 4 +- src/backend/access/gist/gistvacuum.c | 2 +- src/backend/access/transam/generic_xlog.c | 2 +- src/backend/access/transam/xact.c | 2 +- src/backend/access/transam/xlog.c | 2 +- src/backend/access/transam/xloginsert.c | 18 ++--- src/backend/access/transam/xlogreader.c | 2 +- src/backend/backup/basebackup.c | 2 +- src/backend/bootstrap/bootstrap.c | 10 +-- src/backend/catalog/aclchk.c | 22 +++--- src/backend/catalog/namespace.c | 12 +-- src/backend/commands/dbcommands.c | 8 +- src/backend/commands/event_trigger.c | 2 +- src/backend/commands/explain.c | 2 +- src/backend/commands/indexcmds.c | 2 +- src/backend/commands/lockcmds.c | 2 +- src/backend/commands/opclasscmds.c | 2 +- src/backend/commands/schemacmds.c | 6 +- src/backend/commands/tablecmds.c | 6 +- src/backend/commands/trigger.c | 8 +- src/backend/executor/execIndexing.c | 2 +- src/backend/executor/execParallel.c | 4 +- src/backend/executor/nodeAgg.c | 11 ++- src/backend/executor/nodeHash.c | 6 +- src/backend/executor/nodeHashjoin.c | 6 +- src/backend/executor/nodeMemoize.c | 4 +- src/backend/lib/bloomfilter.c | 2 +- src/backend/lib/dshash.c | 2 +- src/backend/lib/integerset.c | 4 +- src/backend/libpq/be-secure-openssl.c | 4 +- src/backend/optimizer/geqo/geqo_selection.c | 2 +- src/backend/optimizer/path/costsize.c | 72 ++++++++--------- src/backend/optimizer/plan/createplan.c | 2 +- src/backend/optimizer/plan/planner.c | 4 +- src/backend/optimizer/util/plancat.c | 3 +- src/backend/parser/gram.y | 3 +- src/backend/parser/parse_clause.c | 2 +- src/backend/parser/parse_utilcmd.c | 2 +- src/backend/partitioning/partbounds.c | 6 +- src/backend/postmaster/postmaster.c | 6 +- src/backend/replication/logical/decode.c | 4 +- src/backend/replication/logical/worker.c | 2 +- src/backend/replication/pgoutput/pgoutput.c | 4 +- src/backend/replication/slot.c | 2 +- src/backend/statistics/extended_stats.c | 4 +- src/backend/storage/buffer/bufmgr.c | 4 +- src/backend/storage/file/buffile.c | 2 +- src/backend/storage/freespace/freespace.c | 2 +- src/backend/storage/ipc/dsm.c | 4 +- src/backend/storage/ipc/procarray.c | 2 +- src/backend/storage/lmgr/lwlock.c | 12 +-- src/backend/storage/lmgr/predicate.c | 2 +- src/backend/storage/smgr/md.c | 48 ++++++------ src/backend/utils/adt/datetime.c | 22 +++--- src/backend/utils/adt/geo_ops.c | 8 +- src/backend/utils/adt/like.c | 4 +- src/backend/utils/adt/numeric.c | 6 +- src/backend/utils/adt/rangetypes.c | 4 +- src/backend/utils/adt/ri_triggers.c | 2 +- src/backend/utils/adt/timestamp.c | 4 +- src/backend/utils/adt/xml.c | 2 +- src/backend/utils/cache/relmapper.c | 2 +- src/backend/utils/error/elog.c | 2 +- .../euc_jp_and_sjis/euc_jp_and_sjis.c | 4 +- .../euc_tw_and_big5/euc_tw_and_big5.c | 2 +- src/backend/utils/misc/guc.c | 2 +- src/backend/utils/misc/queryjumble.c | 3 +- src/backend/utils/sort/tuplesortvariants.c | 2 +- src/backend/utils/time/snapmgr.c | 29 +++---- src/fe_utils/cancel.c | 4 +- src/bin/initdb/initdb.c | 2 +- src/bin/pg_amcheck/pg_amcheck.c | 2 +- src/bin/pg_basebackup/pg_receivewal.c | 2 +- src/bin/pg_basebackup/streamutil.h | 2 +- src/bin/pg_basebackup/walmethods.h | 8 +- src/bin/pg_rewind/file_ops.h | 4 +- src/bin/pg_rewind/pg_rewind.h | 2 +- src/bin/pg_upgrade/info.c | 2 +- src/bin/pg_upgrade/pg_upgrade.h | 2 +- src/bin/pg_upgrade/relfilenumber.c | 2 +- src/bin/pg_verifybackup/pg_verifybackup.c | 2 +- src/bin/pg_waldump/compat.c | 6 +- src/bin/pgbench/pgbench.h | 8 +- src/bin/psql/describe.h | 6 +- src/bin/scripts/common.h | 2 +- src/interfaces/libpq/fe-connect.c | 2 +- src/interfaces/libpq/fe-exec.c | 14 ++-- src/interfaces/libpq/fe-secure-common.h | 4 +- src/interfaces/libpq/fe-secure-openssl.c | 4 +- src/interfaces/libpq/libpq-fe.h | 4 +- src/pl/plpgsql/src/pl_exec.c | 2 +- src/interfaces/ecpg/ecpglib/ecpglib_extern.h | 78 ++++++++++++------- src/interfaces/ecpg/pgtypeslib/dt.h | 22 +++--- src/interfaces/ecpg/preproc/c_keywords.c | 8 +- src/interfaces/ecpg/preproc/output.c | 2 +- src/interfaces/ecpg/preproc/preproc_extern.h | 4 +- src/interfaces/ecpg/preproc/type.c | 2 +- 213 files changed, 569 insertions(+), 542 deletions(-) diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 134b20f1e..e1c4fdbd0 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -161,9 +161,10 @@ extern void index_rescan(IndexScanDesc scan, extern void index_endscan(IndexScanDesc scan); extern void index_markpos(IndexScanDesc scan); extern void index_restrpos(IndexScanDesc scan); -extern Size index_parallelscan_estimate(Relation indexrel, Snapshot snapshot); -extern void index_parallelscan_initialize(Relation heaprel, Relation indexrel, - Snapshot snapshot, ParallelIndexScanDesc target); +extern Size index_parallelscan_estimate(Relation indexRelation, Snapshot snapshot); +extern void index_parallelscan_initialize(Relation heapRelation, + Relation indexRelation, Snapshot snapshot, + ParallelIndexScanDesc target); extern void index_parallelrescan(IndexScanDesc scan); extern IndexScanDesc index_beginscan_parallel(Relation heaprel, Relation indexrel, int nkeys, int norderbys, @@ -191,7 +192,7 @@ extern void index_store_float8_orderby_distances(IndexScanDesc scan, Oid *orderByTypes, IndexOrderByDistance *distances, bool recheckOrderBy); -extern bytea *index_opclass_options(Relation relation, AttrNumber attnum, +extern bytea *index_opclass_options(Relation indrel, AttrNumber attnum, Datum attoptions, bool validate); diff --git a/src/include/access/generic_xlog.h b/src/include/access/generic_xlog.h index c8363a476..da4565642 100644 --- a/src/include/access/generic_xlog.h +++ b/src/include/access/generic_xlog.h @@ -40,6 +40,6 @@ extern void GenericXLogAbort(GenericXLogState *state); extern void generic_redo(XLogReaderState *record); extern const char *generic_identify(uint8 info); extern void generic_desc(StringInfo buf, XLogReaderState *record); -extern void generic_mask(char *pagedata, BlockNumber blkno); +extern void generic_mask(char *page, BlockNumber blkno); #endif /* GENERIC_XLOG_H */ diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h index 2935d2f35..09ac53ed0 100644 --- a/src/include/access/gin_private.h +++ b/src/include/access/gin_private.h @@ -240,7 +240,7 @@ extern void ginDataFillRoot(GinBtree btree, Page root, BlockNumber lblkno, Page */ typedef struct GinVacuumState GinVacuumState; -extern void ginVacuumPostingTreeLeaf(Relation rel, Buffer buf, GinVacuumState *gvs); +extern void ginVacuumPostingTreeLeaf(Relation indexrel, Buffer buffer, GinVacuumState *gvs); /* ginscan.c */ @@ -385,7 +385,7 @@ typedef GinScanOpaqueData *GinScanOpaque; extern IndexScanDesc ginbeginscan(Relation rel, int nkeys, int norderbys); extern void ginendscan(IndexScanDesc scan); -extern void ginrescan(IndexScanDesc scan, ScanKey key, int nscankeys, +extern void ginrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys, ScanKey orderbys, int norderbys); extern void ginNewScanKey(IndexScanDesc scan); extern void ginFreeScanKeys(GinScanOpaque so); @@ -469,10 +469,10 @@ extern void ginInsertCleanup(GinState *ginstate, bool full_clean, extern GinPostingList *ginCompressPostingList(const ItemPointer ipd, int nipd, int maxsize, int *nwritten); -extern int ginPostingListDecodeAllSegmentsToTbm(GinPostingList *ptr, int totalsize, TIDBitmap *tbm); +extern int ginPostingListDecodeAllSegmentsToTbm(GinPostingList *ptr, int len, TIDBitmap *tbm); -extern ItemPointer ginPostingListDecodeAllSegments(GinPostingList *ptr, int len, int *ndecoded); -extern ItemPointer ginPostingListDecode(GinPostingList *ptr, int *ndecoded); +extern ItemPointer ginPostingListDecodeAllSegments(GinPostingList *segment, int len, int *ndecoded_out); +extern ItemPointer ginPostingListDecode(GinPostingList *plist, int *ndecoded); extern ItemPointer ginMergeItemPointers(ItemPointerData *a, uint32 na, ItemPointerData *b, uint32 nb, int *nmerged); diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h index 240131ef7..093bf2344 100644 --- a/src/include/access/gist_private.h +++ b/src/include/access/gist_private.h @@ -445,16 +445,16 @@ extern void gistXLogPageReuse(Relation rel, BlockNumber blkno, extern XLogRecPtr gistXLogUpdate(Buffer buffer, OffsetNumber *todelete, int ntodelete, - IndexTuple *itup, int ntup, - Buffer leftchild); + IndexTuple *itup, int ituplen, + Buffer leftchildbuf); extern XLogRecPtr gistXLogDelete(Buffer buffer, OffsetNumber *todelete, int ntodelete, TransactionId latestRemovedXid); extern XLogRecPtr gistXLogSplit(bool page_is_leaf, SplitedPageLayout *dist, - BlockNumber origrlink, GistNSN oldnsn, - Buffer leftchild, bool markfollowright); + BlockNumber origrlink, GistNSN orignsn, + Buffer leftchildbuf, bool markfollowright); extern XLogRecPtr gistXLogAssignLSN(void); @@ -516,8 +516,8 @@ extern void gistdentryinit(GISTSTATE *giststate, int nkey, GISTENTRY *e, bool l, bool isNull); extern float gistpenalty(GISTSTATE *giststate, int attno, - GISTENTRY *key1, bool isNull1, - GISTENTRY *key2, bool isNull2); + GISTENTRY *orig, bool isNullOrig, + GISTENTRY *add, bool isNullAdd); extern void gistMakeUnionItVec(GISTSTATE *giststate, IndexTuple *itvec, int len, Datum *attr, bool *isnull); extern bool gistKeyIsEQ(GISTSTATE *giststate, int attno, Datum a, Datum b); @@ -556,11 +556,11 @@ extern GISTBuildBuffers *gistInitBuildBuffers(int pagesPerBuffer, int levelStep, int maxLevel); extern GISTNodeBuffer *gistGetNodeBuffer(GISTBuildBuffers *gfbb, GISTSTATE *giststate, - BlockNumber blkno, int level); + BlockNumber nodeBlocknum, int level); extern void gistPushItupToNodeBuffer(GISTBuildBuffers *gfbb, - GISTNodeBuffer *nodeBuffer, IndexTuple item); + GISTNodeBuffer *nodeBuffer, IndexTuple itup); extern bool gistPopItupFromNodeBuffer(GISTBuildBuffers *gfbb, - GISTNodeBuffer *nodeBuffer, IndexTuple *item); + GISTNodeBuffer *nodeBuffer, IndexTuple *itup); extern void gistFreeBuildBuffers(GISTBuildBuffers *gfbb); extern void gistRelocateBuildBuffersOnSplit(GISTBuildBuffers *gfbb, GISTSTATE *giststate, Relation r, diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h index f74051330..21bde78ed 100644 --- a/src/include/access/reloptions.h +++ b/src/include/access/reloptions.h @@ -195,16 +195,16 @@ extern void add_string_reloption(bits32 kinds, const char *name, const char *des const char *default_val, validate_string_relopt validator, LOCKMODE lockmode); -extern void init_local_reloptions(local_relopts *opts, Size relopt_struct_size); -extern void register_reloptions_validator(local_relopts *opts, +extern void init_local_reloptions(local_relopts *relopts, Size relopt_struct_size); +extern void register_reloptions_validator(local_relopts *relopts, relopts_validator validator); -extern void add_local_bool_reloption(local_relopts *opts, const char *name, +extern void add_local_bool_reloption(local_relopts *relopts, const char *name, const char *desc, bool default_val, int offset); -extern void add_local_int_reloption(local_relopts *opts, const char *name, +extern void add_local_int_reloption(local_relopts *relopts, const char *name, const char *desc, int default_val, int min_val, int max_val, int offset); -extern void add_local_real_reloption(local_relopts *opts, const char *name, +extern void add_local_real_reloption(local_relopts *relopts, const char *name, const char *desc, double default_val, double min_val, double max_val, int offset); @@ -213,7 +213,7 @@ extern void add_local_enum_reloption(local_relopts *relopts, relopt_enum_elt_def *members, int default_val, const char *detailmsg, int offset); -extern void add_local_string_reloption(local_relopts *opts, const char *name, +extern void add_local_string_reloption(local_relopts *relopts, const char *name, const char *desc, const char *default_val, validate_string_relopt validator, diff --git a/src/include/access/tupconvert.h b/src/include/access/tupconvert.h index f5a5fd826..a37dafc66 100644 --- a/src/include/access/tupconvert.h +++ b/src/include/access/tupconvert.h @@ -44,7 +44,7 @@ extern HeapTuple execute_attr_map_tuple(HeapTuple tuple, TupleConversionMap *map extern TupleTableSlot *execute_attr_map_slot(AttrMap *attrMap, TupleTableSlot *in_slot, TupleTableSlot *out_slot); -extern Bitmapset *execute_attr_map_cols(AttrMap *attrMap, Bitmapset *inbitmap); +extern Bitmapset *execute_attr_map_cols(AttrMap *attrMap, Bitmapset *in_cols); extern void free_conversion_map(TupleConversionMap *map); diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 28dd6de18..cf27356ba 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -127,7 +127,7 @@ extern void DecrTupleDescRefCount(TupleDesc tupdesc); extern bool equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2); -extern uint32 hashTupleDesc(TupleDesc tupdesc); +extern uint32 hashTupleDesc(TupleDesc desc); extern void TupleDescInitEntry(TupleDesc desc, AttrNumber attributeNumber, diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h index 5d6544e26..f94fded10 100644 --- a/src/include/access/twophase.h +++ b/src/include/access/twophase.h @@ -60,6 +60,6 @@ extern void PrepareRedoAdd(char *buf, XLogRecPtr start_lsn, XLogRecPtr end_lsn, RepOriginId origin_id); extern void PrepareRedoRemove(TransactionId xid, bool giveWarning); extern void restoreTwoPhaseData(void); -extern bool LookupGXact(const char *gid, XLogRecPtr prepare_at_lsn, +extern bool LookupGXact(const char *gid, XLogRecPtr prepare_end_lsn, TimestampTz origin_prepare_timestamp); #endif /* TWOPHASE_H */ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 300baae12..c604ee11f 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -490,8 +490,8 @@ extern int xactGetCommittedChildren(TransactionId **ptr); extern XLogRecPtr XactLogCommitRecord(TimestampTz commit_time, int nsubxacts, TransactionId *subxacts, int nrels, RelFileLocator *rels, - int nstats, - xl_xact_stats_item *stats, + int ndroppedstats, + xl_xact_stats_item *droppedstats, int nmsgs, SharedInvalidationMessage *msgs, bool relcacheInval, int xactflags, @@ -501,8 +501,8 @@ extern XLogRecPtr XactLogCommitRecord(TimestampTz commit_time, extern XLogRecPtr XactLogAbortRecord(TimestampTz abort_time, int nsubxacts, TransactionId *subxacts, int nrels, RelFileLocator *rels, - int nstats, - xl_xact_stats_item *stats, + int ndroppedstats, + xl_xact_stats_item *droppedstats, int xactflags, TransactionId twophase_xid, const char *twophase_gid); extern void xact_redo(XLogReaderState *record); diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 9ebd321ba..3dbfa6b59 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -197,15 +197,15 @@ extern XLogRecPtr XLogInsertRecord(struct XLogRecData *rdata, uint8 flags, int num_fpi, bool topxid_included); -extern void XLogFlush(XLogRecPtr RecPtr); +extern void XLogFlush(XLogRecPtr record); extern bool XLogBackgroundFlush(void); -extern bool XLogNeedsFlush(XLogRecPtr RecPtr); -extern int XLogFileInit(XLogSegNo segno, TimeLineID tli); +extern bool XLogNeedsFlush(XLogRecPtr record); +extern int XLogFileInit(XLogSegNo logsegno, TimeLineID logtli); extern int XLogFileOpen(XLogSegNo segno, TimeLineID tli); extern void CheckXLogRemoved(XLogSegNo segno, TimeLineID tli); extern XLogSegNo XLogGetLastRemovedSegno(void); -extern void XLogSetAsyncXactLSN(XLogRecPtr record); +extern void XLogSetAsyncXactLSN(XLogRecPtr asyncXactLSN); extern void XLogSetReplicationSlotMinimumLSN(XLogRecPtr lsn); extern void xlog_redo(XLogReaderState *record); diff --git a/src/include/access/xloginsert.h b/src/include/access/xloginsert.h index aed4643d1..001ff2f52 100644 --- a/src/include/access/xloginsert.h +++ b/src/include/access/xloginsert.h @@ -52,12 +52,12 @@ extern void XLogRegisterBufData(uint8 block_id, char *data, uint32 len); extern void XLogResetInsertion(void); extern bool XLogCheckBufferNeedsBackup(Buffer buffer); -extern XLogRecPtr log_newpage(RelFileLocator *rlocator, ForkNumber forkNum, - BlockNumber blk, char *page, bool page_std); -extern void log_newpages(RelFileLocator *rlocator, ForkNumber forkNum, int num_pages, +extern XLogRecPtr log_newpage(RelFileLocator *rlocator, ForkNumber forknum, + BlockNumber blkno, char *page, bool page_std); +extern void log_newpages(RelFileLocator *rlocator, ForkNumber forknum, int num_pages, BlockNumber *blknos, char **pages, bool page_std); extern XLogRecPtr log_newpage_buffer(Buffer buffer, bool page_std); -extern void log_newpage_range(Relation rel, ForkNumber forkNum, +extern void log_newpage_range(Relation rel, ForkNumber forknum, BlockNumber startblk, BlockNumber endblk, bool page_std); extern XLogRecPtr XLogSaveBufferForHint(Buffer buffer, bool buffer_std); diff --git a/src/include/access/xlogreader.h b/src/include/access/xlogreader.h index 6afec33d4..6dcde2523 100644 --- a/src/include/access/xlogreader.h +++ b/src/include/access/xlogreader.h @@ -400,7 +400,7 @@ extern bool DecodeXLogRecord(XLogReaderState *state, DecodedXLogRecord *decoded, XLogRecord *record, XLogRecPtr lsn, - char **errmsg); + char **errormsg); /* * Macros that provide access to parts of the record most recently returned by diff --git a/src/include/access/xlogrecovery.h b/src/include/access/xlogrecovery.h index 0aa85d90e..0e3e246bd 100644 --- a/src/include/access/xlogrecovery.h +++ b/src/include/access/xlogrecovery.h @@ -80,7 +80,9 @@ extern PGDLLIMPORT bool StandbyMode; extern Size XLogRecoveryShmemSize(void); extern void XLogRecoveryShmemInit(void); -extern void InitWalRecovery(ControlFileData *ControlFile, bool *wasShutdownPtr, bool *haveBackupLabel, bool *haveTblspcMap); +extern void InitWalRecovery(ControlFileData *ControlFile, + bool *wasShutdown_ptr, bool *haveBackupLabel_ptr, + bool *haveTblspcMap_ptr); extern void PerformWalRecovery(void); /* diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h index ef182977b..18dc5f99a 100644 --- a/src/include/access/xlogutils.h +++ b/src/include/access/xlogutils.h @@ -82,10 +82,10 @@ typedef struct ReadLocalXLogPageNoWaitPrivate } ReadLocalXLogPageNoWaitPrivate; extern XLogRedoAction XLogReadBufferForRedo(XLogReaderState *record, - uint8 buffer_id, Buffer *buf); + uint8 block_id, Buffer *buf); extern Buffer XLogInitBufferForRedo(XLogReaderState *record, uint8 block_id); extern XLogRedoAction XLogReadBufferForRedoExtended(XLogReaderState *record, - uint8 buffer_id, + uint8 block_id, ReadBufferMode mode, bool get_cleanup_lock, Buffer *buf); diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 49d4ad560..89f5b01b3 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -34,8 +34,8 @@ extern PGDLLIMPORT int numattr; extern void BootstrapModeMain(int argc, char *argv[], bool check_only) pg_attribute_noreturn(); -extern void closerel(char *name); -extern void boot_openrel(char *name); +extern void closerel(char *relname); +extern void boot_openrel(char *relname); extern void DefineAttr(char *name, char *type, int attnum, int nullness); extern void InsertOneTuple(void); diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h index 729c4c46c..98a1a8428 100644 --- a/src/include/catalog/dependency.h +++ b/src/include/catalog/dependency.h @@ -249,7 +249,7 @@ extern void recordDependencyOnTablespace(Oid classId, Oid objectId, extern void changeDependencyOnTablespace(Oid classId, Oid objectId, Oid newTablespaceId); -extern void updateAclDependencies(Oid classId, Oid objectId, int32 objectSubId, +extern void updateAclDependencies(Oid classId, Oid objectId, int32 objsubId, Oid ownerId, int noldmembers, Oid *oldmembers, int nnewmembers, Oid *newmembers); @@ -263,8 +263,8 @@ extern void copyTemplateDependencies(Oid templateDbId, Oid newDbId); extern void dropDatabaseDependencies(Oid databaseId); -extern void shdepDropOwned(List *relids, DropBehavior behavior); +extern void shdepDropOwned(List *roleids, DropBehavior behavior); -extern void shdepReassignOwned(List *relids, Oid newrole); +extern void shdepReassignOwned(List *roleids, Oid newrole); #endif /* DEPENDENCY_H */ diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 1bdb00a52..91c28868d 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -149,7 +149,7 @@ extern void index_set_state_flags(Oid indexId, IndexStateFlagsAction action); extern Oid IndexGetRelation(Oid indexId, bool missing_ok); extern void reindex_index(Oid indexId, bool skip_constraint_checks, - char relpersistence, ReindexParams *params); + char persistence, ReindexParams *params); /* Flag bits for reindex_relation(): */ #define REINDEX_REL_PROCESS_TOAST 0x01 @@ -168,7 +168,7 @@ extern Size EstimateReindexStateSpace(void); extern void SerializeReindexState(Size maxsize, char *start_address); extern void RestoreReindexState(void *reindexstate); -extern void IndexSetParentIndex(Relation idx, Oid parentOid); +extern void IndexSetParentIndex(Relation partitionIdx, Oid parentOid); /* diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h index 1bc55c01a..2a2a2e648 100644 --- a/src/include/catalog/namespace.h +++ b/src/include/catalog/namespace.h @@ -85,7 +85,7 @@ extern Oid RangeVarGetRelidExtended(const RangeVar *relation, RangeVarGetRelidCallback callback, void *callback_arg); extern Oid RangeVarGetCreationNamespace(const RangeVar *newRelation); -extern Oid RangeVarGetAndCheckCreationNamespace(RangeVar *newRelation, +extern Oid RangeVarGetAndCheckCreationNamespace(RangeVar *relation, LOCKMODE lockmode, Oid *existing_relation_id); extern void RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid); diff --git a/src/include/catalog/objectaccess.h b/src/include/catalog/objectaccess.h index 567ab63e8..d754f4120 100644 --- a/src/include/catalog/objectaccess.h +++ b/src/include/catalog/objectaccess.h @@ -151,15 +151,15 @@ extern bool RunNamespaceSearchHook(Oid objectId, bool ereport_on_violation); extern void RunFunctionExecuteHook(Oid objectId); /* String versions */ -extern void RunObjectPostCreateHookStr(Oid classId, const char *objectStr, int subId, +extern void RunObjectPostCreateHookStr(Oid classId, const char *objectName, int subId, bool is_internal); -extern void RunObjectDropHookStr(Oid classId, const char *objectStr, int subId, +extern void RunObjectDropHookStr(Oid classId, const char *objectName, int subId, int dropflags); -extern void RunObjectTruncateHookStr(const char *objectStr); -extern void RunObjectPostAlterHookStr(Oid classId, const char *objectStr, int subId, +extern void RunObjectTruncateHookStr(const char *objectName); +extern void RunObjectPostAlterHookStr(Oid classId, const char *objectName, int subId, Oid auxiliaryId, bool is_internal); -extern bool RunNamespaceSearchHookStr(const char *objectStr, bool ereport_on_violation); -extern void RunFunctionExecuteHookStr(const char *objectStr); +extern bool RunNamespaceSearchHookStr(const char *objectName, bool ereport_on_violation); +extern void RunFunctionExecuteHookStr(const char *objectName); /* diff --git a/src/include/catalog/objectaddress.h b/src/include/catalog/objectaddress.h index cf4d8b310..340ffc95a 100644 --- a/src/include/catalog/objectaddress.h +++ b/src/include/catalog/objectaddress.h @@ -77,9 +77,9 @@ extern char *getObjectDescriptionOids(Oid classid, Oid objid); extern int read_objtype_from_string(const char *objtype); extern char *getObjectTypeDescription(const ObjectAddress *object, bool missing_ok); -extern char *getObjectIdentity(const ObjectAddress *address, +extern char *getObjectIdentity(const ObjectAddress *object, bool missing_ok); -extern char *getObjectIdentityParts(const ObjectAddress *address, +extern char *getObjectIdentityParts(const ObjectAddress *object, List **objname, List **objargs, bool missing_ok); extern struct ArrayType *strlist_to_textarray(List *list); diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h index fb26123aa..e59ed94ed 100644 --- a/src/include/catalog/pg_conversion.h +++ b/src/include/catalog/pg_conversion.h @@ -69,7 +69,7 @@ extern ObjectAddress ConversionCreate(const char *conname, Oid connamespace, Oid conowner, int32 conforencoding, int32 contoencoding, Oid conproc, bool def); -extern Oid FindDefaultConversion(Oid connamespace, int32 for_encoding, +extern Oid FindDefaultConversion(Oid name_space, int32 for_encoding, int32 to_encoding); #endif /* PG_CONVERSION_H */ diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h index b5a32755a..9221c2ea5 100644 --- a/src/include/catalog/pg_inherits.h +++ b/src/include/catalog/pg_inherits.h @@ -53,13 +53,14 @@ extern List *find_inheritance_children_extended(Oid parentrelId, bool omit_detac LOCKMODE lockmode, bool *detached_exist, TransactionId *detached_xmin); extern List *find_all_inheritors(Oid parentrelId, LOCKMODE lockmode, - List **parents); + List **numparents); extern bool has_subclass(Oid relationId); extern bool has_superclass(Oid relationId); extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId); extern void StoreSingleInheritance(Oid relationId, Oid parentOid, int32 seqNumber); -extern bool DeleteInheritsTuple(Oid inhrelid, Oid inhparent, bool allow_detached, +extern bool DeleteInheritsTuple(Oid inhrelid, Oid inhparent, + bool expect_detach_pending, const char *childname); extern bool PartitionHasPendingDetach(Oid partoid); diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h index c298327f5..ecf5a28e0 100644 --- a/src/include/catalog/pg_publication.h +++ b/src/include/catalog/pg_publication.h @@ -137,7 +137,7 @@ extern List *GetPublicationSchemas(Oid pubid); extern List *GetSchemaPublications(Oid schemaid); extern List *GetSchemaPublicationRelations(Oid schemaid, PublicationPartOpt pub_partopt); -extern List *GetAllSchemaPublicationRelations(Oid puboid, +extern List *GetAllSchemaPublicationRelations(Oid pubid, PublicationPartOpt pub_partopt); extern List *GetPubPartitionOptionRelations(List *result, PublicationPartOpt pub_partopt, diff --git a/src/include/commands/alter.h b/src/include/commands/alter.h index 52f5e6f6d..fddfa3b85 100644 --- a/src/include/commands/alter.h +++ b/src/include/commands/alter.h @@ -29,7 +29,7 @@ extern Oid AlterObjectNamespace_oid(Oid classId, Oid objid, Oid nspOid, ObjectAddresses *objsMoved); extern ObjectAddress ExecAlterOwnerStmt(AlterOwnerStmt *stmt); -extern void AlterObjectOwner_internal(Relation catalog, Oid objectId, +extern void AlterObjectOwner_internal(Relation rel, Oid objectId, Oid new_ownerId); #endif /* ALTER_H */ diff --git a/src/include/commands/conversioncmds.h b/src/include/commands/conversioncmds.h index ab736fb62..da3136527 100644 --- a/src/include/commands/conversioncmds.h +++ b/src/include/commands/conversioncmds.h @@ -18,6 +18,6 @@ #include "catalog/objectaddress.h" #include "nodes/parsenodes.h" -extern ObjectAddress CreateConversionCommand(CreateConversionStmt *parsetree); +extern ObjectAddress CreateConversionCommand(CreateConversionStmt *stmt); #endif /* CONVERSIONCMDS_H */ diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index cb0096aeb..3f6677b13 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -67,11 +67,11 @@ typedef struct CopyToStateData *CopyToState; typedef int (*copy_data_source_cb) (void *outbuf, int minread, int maxread); -extern void DoCopy(ParseState *state, const CopyStmt *stmt, +extern void DoCopy(ParseState *pstate, const CopyStmt *stmt, int stmt_location, int stmt_len, uint64 *processed); -extern void ProcessCopyOptions(ParseState *pstate, CopyFormatOptions *ops_out, bool is_from, List *options); +extern void ProcessCopyOptions(ParseState *pstate, CopyFormatOptions *opts_out, bool is_from, List *options); extern CopyFromState BeginCopyFrom(ParseState *pstate, Relation rel, Node *whereClause, const char *filename, bool is_program, copy_data_source_cb data_source_cb, List *attnamelist, List *options); @@ -89,7 +89,7 @@ extern DestReceiver *CreateCopyDestReceiver(void); /* * internal prototypes */ -extern CopyToState BeginCopyTo(ParseState *pstate, Relation rel, RawStmt *query, +extern CopyToState BeginCopyTo(ParseState *pstate, Relation rel, RawStmt *raw_query, Oid queryRelId, const char *filename, bool is_program, List *attnamelist, List *options); extern void EndCopyTo(CopyToState cstate); diff --git a/src/include/commands/dbcommands_xlog.h b/src/include/commands/dbcommands_xlog.h index 0ee2452fe..545e5430c 100644 --- a/src/include/commands/dbcommands_xlog.h +++ b/src/include/commands/dbcommands_xlog.h @@ -53,8 +53,8 @@ typedef struct xl_dbase_drop_rec } xl_dbase_drop_rec; #define MinSizeOfDbaseDropRec offsetof(xl_dbase_drop_rec, tablespace_ids) -extern void dbase_redo(XLogReaderState *rptr); -extern void dbase_desc(StringInfo buf, XLogReaderState *rptr); +extern void dbase_redo(XLogReaderState *record); +extern void dbase_desc(StringInfo buf, XLogReaderState *record); extern const char *dbase_identify(uint8 info); #endif /* DBCOMMANDS_XLOG_H */ diff --git a/src/include/commands/matview.h b/src/include/commands/matview.h index a067da39d..7fbb2564a 100644 --- a/src/include/commands/matview.h +++ b/src/include/commands/matview.h @@ -26,7 +26,7 @@ extern void SetMatViewPopulatedState(Relation relation, bool newstate); extern ObjectAddress ExecRefreshMatView(RefreshMatViewStmt *stmt, const char *queryString, ParamListInfo params, QueryCompletion *qc); -extern DestReceiver *CreateTransientRelDestReceiver(Oid oid); +extern DestReceiver *CreateTransientRelDestReceiver(Oid transientoid); extern bool MatViewIncrementalMaintenanceIsEnabled(void); diff --git a/src/include/commands/policy.h b/src/include/commands/policy.h index c5f3753da..f05bb66c6 100644 --- a/src/include/commands/policy.h +++ b/src/include/commands/policy.h @@ -23,7 +23,7 @@ extern void RelationBuildRowSecurity(Relation relation); extern void RemovePolicyById(Oid policy_id); -extern bool RemoveRoleFromObjectPolicy(Oid roleid, Oid classid, Oid objid); +extern bool RemoveRoleFromObjectPolicy(Oid roleid, Oid classid, Oid policy_id); extern ObjectAddress CreatePolicy(CreatePolicyStmt *stmt); extern ObjectAddress AlterPolicy(AlterPolicyStmt *stmt); diff --git a/src/include/commands/publicationcmds.h b/src/include/commands/publicationcmds.h index 57df3fc1e..249119657 100644 --- a/src/include/commands/publicationcmds.h +++ b/src/include/commands/publicationcmds.h @@ -29,7 +29,7 @@ extern void RemovePublicationRelById(Oid proid); extern void RemovePublicationSchemaById(Oid psoid); extern ObjectAddress AlterPublicationOwner(const char *name, Oid newOwnerId); -extern void AlterPublicationOwner_oid(Oid pubid, Oid newOwnerId); +extern void AlterPublicationOwner_oid(Oid subid, Oid newOwnerId); extern void InvalidatePublicationRels(List *relids); extern bool pub_rf_contains_invalid_column(Oid pubid, Relation relation, List *ancestors, bool pubviaroot); diff --git a/src/include/commands/schemacmds.h b/src/include/commands/schemacmds.h index 8c21f2a2c..e6eb2aaa6 100644 --- a/src/include/commands/schemacmds.h +++ b/src/include/commands/schemacmds.h @@ -18,12 +18,12 @@ #include "catalog/objectaddress.h" #include "nodes/parsenodes.h" -extern Oid CreateSchemaCommand(CreateSchemaStmt *parsetree, +extern Oid CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString, int stmt_location, int stmt_len); extern ObjectAddress RenameSchema(const char *oldname, const char *newname); extern ObjectAddress AlterSchemaOwner(const char *name, Oid newOwnerId); -extern void AlterSchemaOwner_oid(Oid schemaOid, Oid newOwnerId); +extern void AlterSchemaOwner_oid(Oid schemaoid, Oid newOwnerId); #endif /* SCHEMACMDS_H */ diff --git a/src/include/commands/seclabel.h b/src/include/commands/seclabel.h index 1577988f1..d8dec9965 100644 --- a/src/include/commands/seclabel.h +++ b/src/include/commands/seclabel.h @@ -28,7 +28,7 @@ extern ObjectAddress ExecSecLabelStmt(SecLabelStmt *stmt); typedef void (*check_object_relabel_type) (const ObjectAddress *object, const char *seclabel); -extern void register_label_provider(const char *provider, +extern void register_label_provider(const char *provider_name, check_object_relabel_type hook); #endif /* SECLABEL_H */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index d38c0e238..b3b04ccfa 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -55,16 +55,16 @@ extern int64 nextval_internal(Oid relid, bool check_permissions); extern Datum nextval(PG_FUNCTION_ARGS); extern List *sequence_options(Oid relid); -extern ObjectAddress DefineSequence(ParseState *pstate, CreateSeqStmt *stmt); +extern ObjectAddress DefineSequence(ParseState *pstate, CreateSeqStmt *seq); extern ObjectAddress AlterSequence(ParseState *pstate, AlterSeqStmt *stmt); extern void SequenceChangePersistence(Oid relid, char newrelpersistence); extern void DeleteSequenceTuple(Oid relid); extern void ResetSequence(Oid seq_relid); extern void ResetSequenceCaches(void); -extern void seq_redo(XLogReaderState *rptr); -extern void seq_desc(StringInfo buf, XLogReaderState *rptr); +extern void seq_redo(XLogReaderState *record); +extern void seq_desc(StringInfo buf, XLogReaderState *record); extern const char *seq_identify(uint8 info); -extern void seq_mask(char *pagedata, BlockNumber blkno); +extern void seq_mask(char *page, BlockNumber blkno); #endif /* SEQUENCE_H */ diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index 0c48654b9..03f14d6be 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -66,7 +66,7 @@ extern void SetRelationHasSubclass(Oid relationId, bool relhassubclass); extern bool CheckRelationTableSpaceMove(Relation rel, Oid newTableSpaceId); extern void SetRelationTableSpace(Relation rel, Oid newTableSpaceId, - RelFileNumber newRelFileNumber); + RelFileNumber newRelFilenumber); extern ObjectAddress renameatt(RenameStmt *stmt); diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h index 1f8090711..a11c9e947 100644 --- a/src/include/commands/tablespace.h +++ b/src/include/commands/tablespace.h @@ -62,8 +62,8 @@ extern char *get_tablespace_name(Oid spc_oid); extern bool directory_is_empty(const char *path); extern void remove_tablespace_symlink(const char *linkloc); -extern void tblspc_redo(XLogReaderState *rptr); -extern void tblspc_desc(StringInfo buf, XLogReaderState *rptr); +extern void tblspc_redo(XLogReaderState *record); +extern void tblspc_desc(StringInfo buf, XLogReaderState *record); extern const char *tblspc_identify(uint8 info); #endif /* TABLESPACE_H */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index b7b6bd600..b0a928bbe 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -166,7 +166,7 @@ extern void TriggerSetParentTrigger(Relation trigRel, Oid parentTrigId, Oid childTableId); extern void RemoveTriggerById(Oid trigOid); -extern Oid get_trigger_oid(Oid relid, const char *name, bool missing_ok); +extern Oid get_trigger_oid(Oid relid, const char *trigname, bool missing_ok); extern ObjectAddress renametrig(RenameStmt *stmt); @@ -231,22 +231,22 @@ extern bool ExecBRUpdateTriggers(EState *estate, ResultRelInfo *relinfo, ItemPointer tupleid, HeapTuple fdw_trigtuple, - TupleTableSlot *slot, - TM_FailureData *tmfdp); + TupleTableSlot *newslot, + TM_FailureData *tmfd); extern void ExecARUpdateTriggers(EState *estate, ResultRelInfo *relinfo, ResultRelInfo *src_partinfo, ResultRelInfo *dst_partinfo, ItemPointer tupleid, HeapTuple fdw_trigtuple, - TupleTableSlot *slot, + TupleTableSlot *newslot, List *recheckIndexes, TransitionCaptureState *transition_capture, bool is_crosspart_update); extern bool ExecIRUpdateTriggers(EState *estate, ResultRelInfo *relinfo, HeapTuple trigtuple, - TupleTableSlot *slot); + TupleTableSlot *newslot); extern void ExecBSTruncateTriggers(EState *estate, ResultRelInfo *relinfo); extern void ExecASTruncateTriggers(EState *estate, @@ -267,9 +267,9 @@ extern bool AfterTriggerPendingOnRel(Oid relid); * in utils/adt/ri_triggers.c */ extern bool RI_FKey_pk_upd_check_required(Trigger *trigger, Relation pk_rel, - TupleTableSlot *old_slot, TupleTableSlot *new_slot); + TupleTableSlot *oldslot, TupleTableSlot *newslot); extern bool RI_FKey_fk_upd_check_required(Trigger *trigger, Relation fk_rel, - TupleTableSlot *old_slot, TupleTableSlot *new_slot); + TupleTableSlot *oldslot, TupleTableSlot *newslot); extern bool RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel); extern void RI_PartitionRemove_Check(Trigger *trigger, Relation fk_rel, diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h index a17bedb85..532bc49c3 100644 --- a/src/include/commands/typecmds.h +++ b/src/include/commands/typecmds.h @@ -34,7 +34,7 @@ extern Oid AssignTypeMultirangeArrayOid(void); extern ObjectAddress AlterDomainDefault(List *names, Node *defaultRaw); extern ObjectAddress AlterDomainNotNull(List *names, bool notNull); -extern ObjectAddress AlterDomainAddConstraint(List *names, Node *constr, +extern ObjectAddress AlterDomainAddConstraint(List *names, Node *newConstraint, ObjectAddress *constrAddr); extern ObjectAddress AlterDomainValidateConstraint(List *names, const char *constrName); extern ObjectAddress AlterDomainDropConstraint(List *names, const char *constrName, diff --git a/src/include/common/fe_memutils.h b/src/include/common/fe_memutils.h index 63f2b6a80..a1751b370 100644 --- a/src/include/common/fe_memutils.h +++ b/src/include/common/fe_memutils.h @@ -26,8 +26,8 @@ extern char *pg_strdup(const char *in); extern void *pg_malloc(size_t size); extern void *pg_malloc0(size_t size); extern void *pg_malloc_extended(size_t size, int flags); -extern void *pg_realloc(void *pointer, size_t size); -extern void pg_free(void *pointer); +extern void *pg_realloc(void *ptr, size_t size); +extern void pg_free(void *ptr); /* * Variants with easier notation and more type safety diff --git a/src/include/common/kwlookup.h b/src/include/common/kwlookup.h index 48d7f08b8..8384e33a5 100644 --- a/src/include/common/kwlookup.h +++ b/src/include/common/kwlookup.h @@ -32,7 +32,7 @@ typedef struct ScanKeywordList } ScanKeywordList; -extern int ScanKeywordLookup(const char *text, const ScanKeywordList *keywords); +extern int ScanKeywordLookup(const char *str, const ScanKeywordList *keywords); /* Code that wants to retrieve the text of the N'th keyword should use this. */ static inline const char * diff --git a/src/include/common/scram-common.h b/src/include/common/scram-common.h index d1f840c11..e1f5e786e 100644 --- a/src/include/common/scram-common.h +++ b/src/include/common/scram-common.h @@ -49,7 +49,7 @@ extern int scram_SaltedPassword(const char *password, const char *salt, int saltlen, int iterations, uint8 *result, const char **errstr); -extern int scram_H(const uint8 *str, int len, uint8 *result, +extern int scram_H(const uint8 *input, int len, uint8 *result, const char **errstr); extern int scram_ClientKey(const uint8 *salted_password, uint8 *result, const char **errstr); diff --git a/src/include/executor/execParallel.h b/src/include/executor/execParallel.h index 3a1b11326..955d0bd64 100644 --- a/src/include/executor/execParallel.h +++ b/src/include/executor/execParallel.h @@ -38,13 +38,13 @@ typedef struct ParallelExecutorInfo } ParallelExecutorInfo; extern ParallelExecutorInfo *ExecInitParallelPlan(PlanState *planstate, - EState *estate, Bitmapset *sendParam, int nworkers, + EState *estate, Bitmapset *sendParams, int nworkers, int64 tuples_needed); extern void ExecParallelCreateReaders(ParallelExecutorInfo *pei); extern void ExecParallelFinish(ParallelExecutorInfo *pei); extern void ExecParallelCleanup(ParallelExecutorInfo *pei); extern void ExecParallelReinitialize(PlanState *planstate, - ParallelExecutorInfo *pei, Bitmapset *sendParam); + ParallelExecutorInfo *pei, Bitmapset *sendParams); extern void ParallelQueryMain(dsm_segment *seg, shm_toc *toc); diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 82925b4b6..0b18a33fa 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -218,7 +218,7 @@ extern LockTupleMode ExecUpdateLockMode(EState *estate, ResultRelInfo *relinfo); extern ExecRowMark *ExecFindRowMark(EState *estate, Index rti, bool missing_ok); extern ExecAuxRowMark *ExecBuildAuxRowMark(ExecRowMark *erm, List *targetlist); extern TupleTableSlot *EvalPlanQual(EPQState *epqstate, Relation relation, - Index rti, TupleTableSlot *testslot); + Index rti, TupleTableSlot *inputslot); extern void EvalPlanQualInit(EPQState *epqstate, EState *parentestate, Plan *subplan, List *auxrowmarks, int epqParam); extern void EvalPlanQualSetPlan(EPQState *epqstate, @@ -432,7 +432,7 @@ ExecQualAndReset(ExprState *state, ExprContext *econtext) } #endif -extern bool ExecCheck(ExprState *state, ExprContext *context); +extern bool ExecCheck(ExprState *state, ExprContext *econtext); /* * prototypes from functions in execSRF.c @@ -473,7 +473,7 @@ extern void ExecInitResultSlot(PlanState *planstate, extern void ExecInitResultTupleSlotTL(PlanState *planstate, const TupleTableSlotOps *tts_ops); extern void ExecInitScanTupleSlot(EState *estate, ScanState *scanstate, - TupleDesc tupleDesc, + TupleDesc tupledesc, const TupleTableSlotOps *tts_ops); extern TupleTableSlot *ExecInitExtraTupleSlot(EState *estate, TupleDesc tupledesc, diff --git a/src/include/executor/nodeIncrementalSort.h b/src/include/executor/nodeIncrementalSort.h index 84cfd96b1..519d95595 100644 --- a/src/include/executor/nodeIncrementalSort.h +++ b/src/include/executor/nodeIncrementalSort.h @@ -22,7 +22,7 @@ extern void ExecReScanIncrementalSort(IncrementalSortState *node); /* parallel instrumentation support */ extern void ExecIncrementalSortEstimate(IncrementalSortState *node, ParallelContext *pcxt); extern void ExecIncrementalSortInitializeDSM(IncrementalSortState *node, ParallelContext *pcxt); -extern void ExecIncrementalSortInitializeWorker(IncrementalSortState *node, ParallelWorkerContext *pcxt); +extern void ExecIncrementalSortInitializeWorker(IncrementalSortState *node, ParallelWorkerContext *pwcxt); extern void ExecIncrementalSortRetrieveInstrumentation(IncrementalSortState *node); #endif /* NODEINCREMENTALSORT_H */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index b2c0c7486..697abe5fc 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -174,7 +174,7 @@ extern void *SPI_palloc(Size size); extern void *SPI_repalloc(void *pointer, Size size); extern void SPI_pfree(void *pointer); extern Datum SPI_datumTransfer(Datum value, bool typByVal, int typLen); -extern void SPI_freetuple(HeapTuple pointer); +extern void SPI_freetuple(HeapTuple tuple); extern void SPI_freetuptable(SPITupleTable *tuptable); extern Portal SPI_cursor_open(const char *name, SPIPlanPtr plan, diff --git a/src/include/fe_utils/cancel.h b/src/include/fe_utils/cancel.h index 3b84daf6e..c256b04f4 100644 --- a/src/include/fe_utils/cancel.h +++ b/src/include/fe_utils/cancel.h @@ -27,6 +27,6 @@ extern void ResetCancelConn(void); * A callback can be optionally set up to be called at cancellation * time. */ -extern void setup_cancel_handler(void (*cancel_callback) (void)); +extern void setup_cancel_handler(void (*query_cancel_callback) (void)); #endif /* CANCEL_H */ diff --git a/src/include/fe_utils/mbprint.h b/src/include/fe_utils/mbprint.h index 5dd218178..6bcd9e078 100644 --- a/src/include/fe_utils/mbprint.h +++ b/src/include/fe_utils/mbprint.h @@ -24,6 +24,7 @@ extern int pg_wcswidth(const char *pwcs, size_t len, int encoding); extern void pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding, struct lineptr *lines, int count); extern void pg_wcssize(const unsigned char *pwcs, size_t len, int encoding, - int *width, int *height, int *format_size); + int *result_width, int *result_height, + int *result_format_size); #endif /* MBPRINT_H */ diff --git a/src/include/fe_utils/parallel_slot.h b/src/include/fe_utils/parallel_slot.h index 8ce63c937..199df9bb0 100644 --- a/src/include/fe_utils/parallel_slot.h +++ b/src/include/fe_utils/parallel_slot.h @@ -58,7 +58,7 @@ ParallelSlotClearHandler(ParallelSlot *slot) slot->handler_context = NULL; } -extern ParallelSlot *ParallelSlotsGetIdle(ParallelSlotArray *slots, +extern ParallelSlot *ParallelSlotsGetIdle(ParallelSlotArray *sa, const char *dbname); extern ParallelSlotArray *ParallelSlotsSetup(int numslots, ConnParams *cparams, diff --git a/src/include/fe_utils/recovery_gen.h b/src/include/fe_utils/recovery_gen.h index 83e181a22..934952f31 100644 --- a/src/include/fe_utils/recovery_gen.h +++ b/src/include/fe_utils/recovery_gen.h @@ -21,7 +21,7 @@ #define MINIMUM_VERSION_FOR_RECOVERY_GUC 120000 extern PQExpBuffer GenerateRecoveryConfig(PGconn *pgconn, - char *pg_replication_slot); + char *replication_slot); extern void WriteRecoveryConfig(PGconn *pgconn, char *target_dir, PQExpBuffer contents); diff --git a/src/include/fe_utils/simple_list.h b/src/include/fe_utils/simple_list.h index 9261a7b0a..757fd6ac5 100644 --- a/src/include/fe_utils/simple_list.h +++ b/src/include/fe_utils/simple_list.h @@ -65,6 +65,6 @@ extern void simple_string_list_destroy(SimpleStringList *list); extern const char *simple_string_list_not_touched(SimpleStringList *list); -extern void simple_ptr_list_append(SimplePtrList *list, void *val); +extern void simple_ptr_list_append(SimplePtrList *list, void *ptr); #endif /* SIMPLE_LIST_H */ diff --git a/src/include/fe_utils/string_utils.h b/src/include/fe_utils/string_utils.h index fa4deb249..0927cb19b 100644 --- a/src/include/fe_utils/string_utils.h +++ b/src/include/fe_utils/string_utils.h @@ -24,7 +24,7 @@ extern PGDLLIMPORT int quote_all_identifiers; extern PQExpBuffer (*getLocalPQExpBuffer) (void); /* Functions */ -extern const char *fmtId(const char *identifier); +extern const char *fmtId(const char *rawid); extern const char *fmtQualifiedId(const char *schema, const char *id); extern char *formatPGVersionNumber(int version_number, bool include_minor, diff --git a/src/include/foreign/foreign.h b/src/include/foreign/foreign.h index 75538110f..ac8212553 100644 --- a/src/include/foreign/foreign.h +++ b/src/include/foreign/foreign.h @@ -67,12 +67,13 @@ typedef struct ForeignTable extern ForeignServer *GetForeignServer(Oid serverid); extern ForeignServer *GetForeignServerExtended(Oid serverid, bits16 flags); -extern ForeignServer *GetForeignServerByName(const char *name, bool missing_ok); +extern ForeignServer *GetForeignServerByName(const char *srvname, + bool missing_ok); extern UserMapping *GetUserMapping(Oid userid, Oid serverid); extern ForeignDataWrapper *GetForeignDataWrapper(Oid fdwid); extern ForeignDataWrapper *GetForeignDataWrapperExtended(Oid fdwid, bits16 flags); -extern ForeignDataWrapper *GetForeignDataWrapperByName(const char *name, +extern ForeignDataWrapper *GetForeignDataWrapperByName(const char *fdwname, bool missing_ok); extern ForeignTable *GetForeignTable(Oid relid); diff --git a/src/include/funcapi.h b/src/include/funcapi.h index dc3d819a1..10dbe3981 100644 --- a/src/include/funcapi.h +++ b/src/include/funcapi.h @@ -348,7 +348,7 @@ extern void end_MultiFuncCall(PG_FUNCTION_ARGS, FuncCallContext *funcctx); * "VARIADIC NULL". */ extern int extract_variadic_args(FunctionCallInfo fcinfo, int variadic_start, - bool convert_unknown, Datum **values, + bool convert_unknown, Datum **args, Oid **types, bool **nulls); #endif /* FUNCAPI_H */ diff --git a/src/include/libpq/pqmq.h b/src/include/libpq/pqmq.h index 6687c8f4c..0d7b43d83 100644 --- a/src/include/libpq/pqmq.h +++ b/src/include/libpq/pqmq.h @@ -19,6 +19,6 @@ extern void pq_redirect_to_shm_mq(dsm_segment *seg, shm_mq_handle *mqh); extern void pq_set_parallel_leader(pid_t pid, BackendId backend_id); -extern void pq_parse_errornotice(StringInfo str, ErrorData *edata); +extern void pq_parse_errornotice(StringInfo msg, ErrorData *edata); #endif /* PQMQ_H */ diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 1e8c3af36..4f2643742 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -606,11 +606,11 @@ extern int pg_encoding_wchar2mb_with_len(int encoding, extern int pg_char_and_wchar_strcmp(const char *s1, const pg_wchar *s2); extern int pg_wchar_strncmp(const pg_wchar *s1, const pg_wchar *s2, size_t n); extern int pg_char_and_wchar_strncmp(const char *s1, const pg_wchar *s2, size_t n); -extern size_t pg_wchar_strlen(const pg_wchar *wstr); +extern size_t pg_wchar_strlen(const pg_wchar *str); extern int pg_mblen(const char *mbstr); extern int pg_dsplen(const char *mbstr); extern int pg_mbstrlen(const char *mbstr); -extern int pg_mbstrlen_with_len(const char *mbstr, int len); +extern int pg_mbstrlen_with_len(const char *mbstr, int limit); extern int pg_mbcliplen(const char *mbstr, int len, int limit); extern int pg_encoding_mbcliplen(int encoding, const char *mbstr, int len, int limit); @@ -641,7 +641,7 @@ extern int pg_do_encoding_conversion_buf(Oid proc, int src_encoding, int dest_encoding, unsigned char *src, int srclen, - unsigned char *dst, int dstlen, + unsigned char *dest, int destlen, bool noError); extern char *pg_client_to_server(const char *s, int len); diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 65cf4ba50..ee48e392e 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -352,7 +352,7 @@ extern bool InSecurityRestrictedOperation(void); extern bool InNoForceRLSOperation(void); extern void GetUserIdAndContext(Oid *userid, bool *sec_def_context); extern void SetUserIdAndContext(Oid userid, bool sec_def_context); -extern void InitializeSessionUserId(const char *rolename, Oid useroid); +extern void InitializeSessionUserId(const char *rolename, Oid roleid); extern void InitializeSessionUserIdStandalone(void); extern void SetSessionAuthorization(Oid userid, bool is_superuser); extern Oid GetCurrentRoleId(void); diff --git a/src/include/nodes/extensible.h b/src/include/nodes/extensible.h index 34936db89..820b90484 100644 --- a/src/include/nodes/extensible.h +++ b/src/include/nodes/extensible.h @@ -72,8 +72,8 @@ typedef struct ExtensibleNodeMethods void (*nodeRead) (struct ExtensibleNode *node); } ExtensibleNodeMethods; -extern void RegisterExtensibleNodeMethods(const ExtensibleNodeMethods *method); -extern const ExtensibleNodeMethods *GetExtensibleNodeMethods(const char *name, +extern void RegisterExtensibleNodeMethods(const ExtensibleNodeMethods *methods); +extern const ExtensibleNodeMethods *GetExtensibleNodeMethods(const char *extnodename, bool missing_ok); /* diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index cdd6debfa..a80f43e54 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -218,7 +218,7 @@ extern int16 *readAttrNumberCols(int numCols); /* * nodes/copyfuncs.c */ -extern void *copyObjectImpl(const void *obj); +extern void *copyObjectImpl(const void *from); /* cast result back to argument type, if supported by compiler */ #ifdef HAVE_TYPEOF diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index de2dd907e..543543d68 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -163,8 +163,8 @@ extern ParamListInfo copyParamList(ParamListInfo from); extern Size EstimateParamListSpace(ParamListInfo paramLI); extern void SerializeParamList(ParamListInfo paramLI, char **start_address); extern ParamListInfo RestoreParamList(char **start_address); -extern char *BuildParamLogString(ParamListInfo params, char **paramTextValues, - int valueLen); +extern char *BuildParamLogString(ParamListInfo params, char **knownTextValues, + int maxlen); extern void ParamsErrorCallback(void *arg); #endif /* PARAMS_H */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index a6e04d04a..dc991626b 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -619,9 +619,9 @@ extern void list_deduplicate_oid(List *list); extern void list_free(List *list); extern void list_free_deep(List *list); -extern pg_nodiscard List *list_copy(const List *list); +extern pg_nodiscard List *list_copy(const List *oldlist); extern pg_nodiscard List *list_copy_head(const List *oldlist, int len); -extern pg_nodiscard List *list_copy_tail(const List *list, int nskip); +extern pg_nodiscard List *list_copy_tail(const List *oldlist, int nskip); extern pg_nodiscard List *list_copy_deep(const List *oldlist); typedef int (*list_sort_comparator) (const ListCell *a, const ListCell *b); diff --git a/src/include/nodes/value.h b/src/include/nodes/value.h index 5e83b843d..91878e8b9 100644 --- a/src/include/nodes/value.h +++ b/src/include/nodes/value.h @@ -83,7 +83,7 @@ typedef struct BitString extern Integer *makeInteger(int i); extern Float *makeFloat(char *numericStr); -extern Boolean *makeBoolean(bool var); +extern Boolean *makeBoolean(bool val); extern String *makeString(char *str); extern BitString *makeBitString(char *str); diff --git a/src/include/optimizer/appendinfo.h b/src/include/optimizer/appendinfo.h index 5e80a741a..28568fab5 100644 --- a/src/include/optimizer/appendinfo.h +++ b/src/include/optimizer/appendinfo.h @@ -40,7 +40,7 @@ extern void get_translated_update_targetlist(PlannerInfo *root, Index relid, List **update_colnos); extern AppendRelInfo **find_appinfos_by_relids(PlannerInfo *root, Relids relids, int *nappinfos); -extern void add_row_identity_var(PlannerInfo *root, Var *rowid_var, +extern void add_row_identity_var(PlannerInfo *root, Var *orig_var, Index rtindex, const char *rowid_name); extern void add_row_identity_columns(PlannerInfo *root, Index rtindex, RangeTblEntry *target_rte, diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 6c5203dc4..ff242d1b6 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -40,8 +40,8 @@ extern bool contain_leaked_vars(Node *clause); extern Relids find_nonnullable_rels(Node *clause); extern List *find_nonnullable_vars(Node *clause); -extern List *find_forced_null_vars(Node *clause); -extern Var *find_forced_null_var(Node *clause); +extern List *find_forced_null_vars(Node *node); +extern Var *find_forced_null_var(Node *node); extern bool is_pseudo_constant_clause(Node *clause); extern bool is_pseudo_constant_clause_relids(Node *clause, Relids relids); diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 9e91da711..2e2eb705f 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -169,7 +169,7 @@ extern void final_cost_hashjoin(PlannerInfo *root, HashPath *path, JoinCostWorkspace *workspace, JoinPathExtraData *extra); extern void cost_gather(GatherPath *path, PlannerInfo *root, - RelOptInfo *baserel, ParamPathInfo *param_info, double *rows); + RelOptInfo *rel, ParamPathInfo *param_info, double *rows); extern void cost_gather_merge(GatherMergePath *path, PlannerInfo *root, RelOptInfo *rel, ParamPathInfo *param_info, Cost input_startup_cost, Cost input_total_cost, diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index d11cdac7f..881386997 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -170,8 +170,8 @@ extern void add_child_rel_equivalences(PlannerInfo *root, extern void add_child_join_rel_equivalences(PlannerInfo *root, int nappinfos, AppendRelInfo **appinfos, - RelOptInfo *parent_rel, - RelOptInfo *child_rel); + RelOptInfo *parent_joinrel, + RelOptInfo *child_joinrel); extern List *generate_implied_equalities_for_column(PlannerInfo *root, RelOptInfo *rel, ec_matches_callback_type callback, diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 1566f435b..9dffdcfd1 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -115,6 +115,6 @@ extern Plan *set_plan_references(PlannerInfo *root, Plan *plan); extern bool trivial_subqueryscan(SubqueryScan *plan); extern void record_plan_function_dependency(PlannerInfo *root, Oid funcid); extern void record_plan_type_dependency(PlannerInfo *root, Oid typid); -extern bool extract_query_dependencies_walker(Node *node, PlannerInfo *root); +extern bool extract_query_dependencies_walker(Node *node, PlannerInfo *context); #endif /* PLANMAIN_H */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 2b11ff1d1..5b4f350b3 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -45,7 +45,7 @@ extern PlanRowMark *get_plan_rowmark(List *rowmarks, Index rtindex); * prototypes for prepagg.c */ extern void get_agg_clause_costs(PlannerInfo *root, AggSplit aggsplit, - AggClauseCosts *agg_costs); + AggClauseCosts *costs); extern void preprocess_aggrefs(PlannerInfo *root, Node *clause); /* diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index dc379547c..3d3a5918c 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -43,7 +43,7 @@ extern List *transformInsertRow(ParseState *pstate, List *exprlist, List *stmtcols, List *icolumns, List *attrnos, bool strip_indirection); extern List *transformUpdateTargetList(ParseState *pstate, - List *targetList); + List *origTlist); extern Query *transformTopLevelStmt(ParseState *pstate, RawStmt *parseTree); extern Query *transformStmt(ParseState *pstate, Node *parseTree); diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index c56822f64..0856af5b4 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -19,7 +19,7 @@ extern void transformAggregateCall(ParseState *pstate, Aggref *agg, List *args, List *aggorder, bool agg_distinct); -extern Node *transformGroupingFunc(ParseState *pstate, GroupingFunc *g); +extern Node *transformGroupingFunc(ParseState *pstate, GroupingFunc *p); extern void transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc, WindowDef *windef); diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index e15b62290..7a57b199b 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -29,8 +29,8 @@ extern Oid LookupOperWithArgs(ObjectWithArgs *oper, bool noError); /* Routines to find operators matching a name and given input types */ /* NB: the selected operator may require coercion of the input types! */ -extern Operator oper(ParseState *pstate, List *op, Oid arg1, Oid arg2, - bool noError, int location); +extern Operator oper(ParseState *pstate, List *opname, Oid ltypeId, + Oid rtypeId, bool noError, int location); extern Operator left_oper(ParseState *pstate, List *op, Oid arg, bool noError, int location); diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index de21c3c64..484db165d 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -88,7 +88,7 @@ extern ParseNamespaceItem *addRangeTableEntryForJoin(ParseState *pstate, List *aliasvars, List *leftcols, List *rightcols, - Alias *joinalias, + Alias *join_using_alias, Alias *alias, bool inFromCl); extern ParseNamespaceItem *addRangeTableEntryForCTE(ParseState *pstate, diff --git a/src/include/partitioning/partbounds.h b/src/include/partitioning/partbounds.h index b1e3f1b84..1f5b706d8 100644 --- a/src/include/partitioning/partbounds.h +++ b/src/include/partitioning/partbounds.h @@ -98,7 +98,7 @@ typedef struct PartitionBoundInfoData #define partition_bound_accepts_nulls(bi) ((bi)->null_index != -1) #define partition_bound_has_default(bi) ((bi)->default_index != -1) -extern int get_hash_partition_greatest_modulus(PartitionBoundInfo b); +extern int get_hash_partition_greatest_modulus(PartitionBoundInfo bound); extern uint64 compute_partition_hash_value(int partnatts, FmgrInfo *partsupfunc, Oid *partcollation, Datum *values, bool *isnull); @@ -125,7 +125,7 @@ extern void check_new_partition_bound(char *relname, Relation parent, PartitionBoundSpec *spec, ParseState *pstate); extern void check_default_partition_contents(Relation parent, - Relation defaultRel, + Relation default_rel, PartitionBoundSpec *new_spec); extern int32 partition_rbound_datum_cmp(FmgrInfo *partsupfunc, diff --git a/src/include/pgstat.h b/src/include/pgstat.h index ac28f813b..ad7334a0d 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -417,7 +417,7 @@ extern long pgstat_report_stat(bool force); extern void pgstat_force_next_flush(void); extern void pgstat_reset_counters(void); -extern void pgstat_reset(PgStat_Kind kind, Oid dboid, Oid objectid); +extern void pgstat_reset(PgStat_Kind kind, Oid dboid, Oid objoid); extern void pgstat_reset_of_kind(PgStat_Kind kind); /* stats accessors */ @@ -474,7 +474,7 @@ extern void pgstat_report_connect(Oid dboid); #define pgstat_count_conn_txn_idle_time(n) \ (pgStatTransactionIdleTime += (n)) -extern PgStat_StatDBEntry *pgstat_fetch_stat_dbentry(Oid dbid); +extern PgStat_StatDBEntry *pgstat_fetch_stat_dbentry(Oid dboid); /* * Functions in pgstat_function.c @@ -489,7 +489,7 @@ extern void pgstat_init_function_usage(struct FunctionCallInfoBaseData *fcinfo, extern void pgstat_end_function_usage(PgStat_FunctionCallUsage *fcu, bool finalize); -extern PgStat_StatFuncEntry *pgstat_fetch_stat_funcentry(Oid funcid); +extern PgStat_StatFuncEntry *pgstat_fetch_stat_funcentry(Oid func_id); extern PgStat_BackendFunctionEntry *find_funcstat_entry(Oid func_id); @@ -499,7 +499,7 @@ extern PgStat_BackendFunctionEntry *find_funcstat_entry(Oid func_id); extern void pgstat_create_relation(Relation rel); extern void pgstat_drop_relation(Relation rel); -extern void pgstat_copy_relation_stats(Relation dstrel, Relation srcrel); +extern void pgstat_copy_relation_stats(Relation dst, Relation src); extern void pgstat_init_relation(Relation rel); extern void pgstat_assoc_relation(Relation rel); @@ -571,7 +571,7 @@ extern void pgstat_twophase_postabort(TransactionId xid, uint16 info, extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry(Oid relid); extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry_ext(bool shared, - Oid relid); + Oid reloid); extern PgStat_TableStatus *find_tabstat_entry(Oid rel_id); diff --git a/src/include/pgtime.h b/src/include/pgtime.h index 1c44be8ba..9ee590600 100644 --- a/src/include/pgtime.h +++ b/src/include/pgtime.h @@ -75,8 +75,8 @@ extern bool pg_tz_acceptable(pg_tz *tz); /* these functions are in strftime.c */ -extern size_t pg_strftime(char *s, size_t max, const char *format, - const struct pg_tm *tm); +extern size_t pg_strftime(char *s, size_t maxsize, const char *format, + const struct pg_tm *t); /* these functions and variables are in pgtz.c */ diff --git a/src/include/port.h b/src/include/port.h index fe48618df..3562d471b 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -46,14 +46,14 @@ extern bool pg_set_block(pgsocket sock); /* Portable path handling for Unix/Win32 (in path.c) */ -extern bool has_drive_prefix(const char *filename); +extern bool has_drive_prefix(const char *path); extern char *first_dir_separator(const char *filename); extern char *last_dir_separator(const char *filename); extern char *first_path_var_separator(const char *pathlist); extern void join_path_components(char *ret_path, const char *head, const char *tail); extern void canonicalize_path(char *path); -extern void make_native_path(char *path); +extern void make_native_path(char *filename); extern void cleanup_path(char *path); extern bool path_contains_parent_reference(const char *path); extern bool path_is_relative_and_below_cwd(const char *path); @@ -439,7 +439,7 @@ extern void qsort_arg(void *base, size_t nel, size_t elsize, extern void qsort_interruptible(void *base, size_t nel, size_t elsize, qsort_arg_comparator cmp, void *arg); -extern void *bsearch_arg(const void *key, const void *base, +extern void *bsearch_arg(const void *key, const void *base0, size_t nmemb, size_t size, int (*compar) (const void *, const void *, void *), void *arg); @@ -479,7 +479,7 @@ extern pqsigfunc pqsignal(int signo, pqsigfunc func); extern char *escape_single_quotes_ascii(const char *src); /* common/wait_error.c */ -extern char *wait_result_to_str(int exit_status); +extern char *wait_result_to_str(int exitstatus); extern bool wait_result_is_signal(int exit_status, int signum); extern bool wait_result_is_any_signal(int exit_status, bool include_command_not_found); diff --git a/src/include/postmaster/bgworker.h b/src/include/postmaster/bgworker.h index 96975bdc9..271b94616 100644 --- a/src/include/postmaster/bgworker.h +++ b/src/include/postmaster/bgworker.h @@ -121,7 +121,7 @@ extern bool RegisterDynamicBackgroundWorker(BackgroundWorker *worker, /* Query the status of a bgworker */ extern BgwHandleStatus GetBackgroundWorkerPid(BackgroundWorkerHandle *handle, pid_t *pidp); -extern BgwHandleStatus WaitForBackgroundWorkerStartup(BackgroundWorkerHandle *handle, pid_t *pid); +extern BgwHandleStatus WaitForBackgroundWorkerStartup(BackgroundWorkerHandle *handle, pid_t *pidp); extern BgwHandleStatus WaitForBackgroundWorkerShutdown(BackgroundWorkerHandle *); extern const char *GetBackgroundWorkerTypeByPid(pid_t pid); diff --git a/src/include/postmaster/syslogger.h b/src/include/postmaster/syslogger.h index 6436724f3..d4c33c844 100644 --- a/src/include/postmaster/syslogger.h +++ b/src/include/postmaster/syslogger.h @@ -84,7 +84,7 @@ extern PGDLLIMPORT HANDLE syslogPipe[2]; extern int SysLogger_Start(void); -extern void write_syslogger_file(const char *buffer, int count, int dest); +extern void write_syslogger_file(const char *buffer, int count, int destination); #ifdef EXEC_BACKEND extern void SysLoggerMain(int argc, char *argv[]) pg_attribute_noreturn(); diff --git a/src/include/replication/logical.h b/src/include/replication/logical.h index edadacd58..5c747e2c4 100644 --- a/src/include/replication/logical.h +++ b/src/include/replication/logical.h @@ -133,7 +133,7 @@ extern void DecodingContextFindStartpoint(LogicalDecodingContext *ctx); extern bool DecodingContextReady(LogicalDecodingContext *ctx); extern void FreeDecodingContext(LogicalDecodingContext *ctx); -extern void LogicalIncreaseXminForSlot(XLogRecPtr lsn, TransactionId xmin); +extern void LogicalIncreaseXminForSlot(XLogRecPtr current_lsn, TransactionId xmin); extern void LogicalIncreaseRestartDecodingForSlot(XLogRecPtr current_lsn, XLogRecPtr restart_lsn); extern void LogicalConfirmReceivedLocation(XLogRecPtr lsn); diff --git a/src/include/replication/logicalproto.h b/src/include/replication/logicalproto.h index a771ab8ff..7eaa4c97e 100644 --- a/src/include/replication/logicalproto.h +++ b/src/include/replication/logicalproto.h @@ -219,7 +219,7 @@ extern LogicalRepRelId logicalrep_read_update(StringInfo in, bool *has_oldtuple, LogicalRepTupleData *oldtup, LogicalRepTupleData *newtup); extern void logicalrep_write_delete(StringInfo out, TransactionId xid, - Relation rel, TupleTableSlot *oldtuple, + Relation rel, TupleTableSlot *oldslot, bool binary); extern LogicalRepRelId logicalrep_read_delete(StringInfo in, LogicalRepTupleData *oldtup); @@ -235,7 +235,7 @@ extern void logicalrep_write_rel(StringInfo out, TransactionId xid, extern LogicalRepRelation *logicalrep_read_rel(StringInfo in); extern void logicalrep_write_typ(StringInfo out, TransactionId xid, Oid typoid); -extern void logicalrep_read_typ(StringInfo out, LogicalRepTyp *ltyp); +extern void logicalrep_read_typ(StringInfo in, LogicalRepTyp *ltyp); extern void logicalrep_write_stream_start(StringInfo out, TransactionId xid, bool first_segment); extern TransactionId logicalrep_read_stream_start(StringInfo in, @@ -243,7 +243,7 @@ extern TransactionId logicalrep_read_stream_start(StringInfo in, extern void logicalrep_write_stream_stop(StringInfo out); extern void logicalrep_write_stream_commit(StringInfo out, ReorderBufferTXN *txn, XLogRecPtr commit_lsn); -extern TransactionId logicalrep_read_stream_commit(StringInfo out, +extern TransactionId logicalrep_read_stream_commit(StringInfo in, LogicalRepCommitData *commit_data); extern void logicalrep_write_stream_abort(StringInfo out, TransactionId xid, TransactionId subxid); diff --git a/src/include/replication/origin.h b/src/include/replication/origin.h index 2d1b5e5c2..2a50d10b5 100644 --- a/src/include/replication/origin.h +++ b/src/include/replication/origin.h @@ -38,8 +38,8 @@ extern PGDLLIMPORT XLogRecPtr replorigin_session_origin_lsn; extern PGDLLIMPORT TimestampTz replorigin_session_origin_timestamp; /* API for querying & manipulating replication origins */ -extern RepOriginId replorigin_by_name(const char *name, bool missing_ok); -extern RepOriginId replorigin_create(const char *name); +extern RepOriginId replorigin_by_name(const char *roname, bool missing_ok); +extern RepOriginId replorigin_create(const char *roname); extern void replorigin_drop_by_name(const char *name, bool missing_ok, bool nowait); extern bool replorigin_by_oid(RepOriginId roident, bool missing_ok, char **roname); diff --git a/src/include/replication/slot.h b/src/include/replication/slot.h index 8c9f3321d..9d68bfa64 100644 --- a/src/include/replication/slot.h +++ b/src/include/replication/slot.h @@ -195,7 +195,7 @@ extern void ReplicationSlotsShmemInit(void); /* management of individual slots */ extern void ReplicationSlotCreate(const char *name, bool db_specific, - ReplicationSlotPersistency p, bool two_phase); + ReplicationSlotPersistency persistency, bool two_phase); extern void ReplicationSlotPersist(void); extern void ReplicationSlotDrop(const char *name, bool nowait); diff --git a/src/include/replication/walsender.h b/src/include/replication/walsender.h index d99a21b07..8336a6e71 100644 --- a/src/include/replication/walsender.h +++ b/src/include/replication/walsender.h @@ -36,7 +36,7 @@ extern PGDLLIMPORT int wal_sender_timeout; extern PGDLLIMPORT bool log_replication_commands; extern void InitWalSender(void); -extern bool exec_replication_command(const char *query_string); +extern bool exec_replication_command(const char *cmd_string); extern void WalSndErrorCleanup(void); extern void WalSndResourceCleanup(bool isCommit); extern void WalSndSignals(void); diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index 98b9b3a28..f001ca41b 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.h @@ -42,7 +42,7 @@ typedef enum ReplaceVarsNoMatchOption extern void OffsetVarNodes(Node *node, int offset, int sublevels_up); -extern void ChangeVarNodes(Node *node, int old_varno, int new_varno, +extern void ChangeVarNodes(Node *node, int rt_index, int new_index, int sublevels_up); extern void IncrementVarSublevelsUp(Node *node, int delta_sublevels_up, int min_sublevels_up); diff --git a/src/include/snowball/libstemmer/header.h b/src/include/snowball/libstemmer/header.h index bf172d5b9..ef5a54640 100644 --- a/src/include/snowball/libstemmer/header.h +++ b/src/include/snowball/libstemmer/header.h @@ -45,7 +45,7 @@ extern int eq_v_b(struct SN_env * z, const symbol * p); extern int find_among(struct SN_env * z, const struct among * v, int v_size); extern int find_among_b(struct SN_env * z, const struct among * v, int v_size); -extern int replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s, int * adjustment); +extern int replace_s(struct SN_env * z, int c_bra, int c_ket, int s_size, const symbol * s, int * adjptr); extern int slice_from_s(struct SN_env * z, int s_size, const symbol * s); extern int slice_from_v(struct SN_env * z, const symbol * p); extern int slice_del(struct SN_env * z); diff --git a/src/include/statistics/extended_stats_internal.h b/src/include/statistics/extended_stats_internal.h index 71f852c15..906919d88 100644 --- a/src/include/statistics/extended_stats_internal.h +++ b/src/include/statistics/extended_stats_internal.h @@ -79,7 +79,7 @@ extern MVDependencies *statext_dependencies_deserialize(bytea *data); extern MCVList *statext_mcv_build(StatsBuildData *data, double totalrows, int stattarget); -extern bytea *statext_mcv_serialize(MCVList *mcv, VacAttrStats **stats); +extern bytea *statext_mcv_serialize(MCVList *mcvlist, VacAttrStats **stats); extern MCVList *statext_mcv_deserialize(bytea *data); extern MultiSortSupport multi_sort_init(int ndims); diff --git a/src/include/statistics/statistics.h b/src/include/statistics/statistics.h index bb7ef1240..0351927a2 100644 --- a/src/include/statistics/statistics.h +++ b/src/include/statistics/statistics.h @@ -102,8 +102,8 @@ extern void BuildRelationExtStatistics(Relation onerel, bool inh, double totalro int numrows, HeapTuple *rows, int natts, VacAttrStats **vacattrstats); extern int ComputeExtStatisticsRows(Relation onerel, - int natts, VacAttrStats **stats); -extern bool statext_is_kind_built(HeapTuple htup, char kind); + int natts, VacAttrStats **vacattrstats); +extern bool statext_is_kind_built(HeapTuple htup, char type); extern Selectivity dependencies_clauselist_selectivity(PlannerInfo *root, List *clauses, int varRelid, diff --git a/src/include/storage/barrier.h b/src/include/storage/barrier.h index 57d2c52e7..4b16ab812 100644 --- a/src/include/storage/barrier.h +++ b/src/include/storage/barrier.h @@ -34,7 +34,7 @@ typedef struct Barrier ConditionVariable condition_variable; } Barrier; -extern void BarrierInit(Barrier *barrier, int num_workers); +extern void BarrierInit(Barrier *barrier, int participants); extern bool BarrierArriveAndWait(Barrier *barrier, uint32 wait_event_info); extern bool BarrierArriveAndDetach(Barrier *barrier); extern bool BarrierArriveAndDetachExceptLast(Barrier *barrier); diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 6a947021a..2708c4b68 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -499,9 +499,9 @@ extern Size PageGetFreeSpace(Page page); extern Size PageGetFreeSpaceForMultipleTuples(Page page, int ntups); extern Size PageGetExactFreeSpace(Page page); extern Size PageGetHeapFreeSpace(Page page); -extern void PageIndexTupleDelete(Page page, OffsetNumber offset); +extern void PageIndexTupleDelete(Page page, OffsetNumber offnum); extern void PageIndexMultiDelete(Page page, OffsetNumber *itemnos, int nitems); -extern void PageIndexTupleDeleteNoCompact(Page page, OffsetNumber offset); +extern void PageIndexTupleDeleteNoCompact(Page page, OffsetNumber offnum); extern bool PageIndexTupleOverwrite(Page page, OffsetNumber offnum, Item newtup, Size newsize); extern char *PageSetChecksumCopy(Page page, BlockNumber blkno); diff --git a/src/include/storage/dsm.h b/src/include/storage/dsm.h index 4dd6af23a..edb32fe99 100644 --- a/src/include/storage/dsm.h +++ b/src/include/storage/dsm.h @@ -45,8 +45,8 @@ extern void dsm_detach(dsm_segment *seg); extern void dsm_pin_mapping(dsm_segment *seg); extern void dsm_unpin_mapping(dsm_segment *seg); extern void dsm_pin_segment(dsm_segment *seg); -extern void dsm_unpin_segment(dsm_handle h); -extern dsm_segment *dsm_find_mapping(dsm_handle h); +extern void dsm_unpin_segment(dsm_handle handle); +extern dsm_segment *dsm_find_mapping(dsm_handle handle); /* Informational functions. */ extern void *dsm_segment_address(dsm_segment *seg); diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 2b4a8e0ff..5a48fccd9 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -117,11 +117,11 @@ extern int FileGetRawFlags(File file); extern mode_t FileGetRawMode(File file); /* Operations used for sharing named temporary files */ -extern File PathNameCreateTemporaryFile(const char *name, bool error_on_failure); +extern File PathNameCreateTemporaryFile(const char *path, bool error_on_failure); extern File PathNameOpenTemporaryFile(const char *path, int mode); -extern bool PathNameDeleteTemporaryFile(const char *name, bool error_on_failure); -extern void PathNameCreateTemporaryDir(const char *base, const char *name); -extern void PathNameDeleteTemporaryDir(const char *name); +extern bool PathNameDeleteTemporaryFile(const char *path, bool error_on_failure); +extern void PathNameCreateTemporaryDir(const char *basedir, const char *directory); +extern void PathNameDeleteTemporaryDir(const char *dirname); extern void TempTablespacePath(char *path, Oid tablespace); /* Operations that allow use of regular stdio --- USE WITH CAUTION */ @@ -177,7 +177,7 @@ extern int pg_fsync(int fd); extern int pg_fsync_no_writethrough(int fd); extern int pg_fsync_writethrough(int fd); extern int pg_fdatasync(int fd); -extern void pg_flush_data(int fd, off_t offset, off_t amount); +extern void pg_flush_data(int fd, off_t offset, off_t nbytes); extern ssize_t pg_pwritev_with_retry(int fd, const struct iovec *iov, int iovcnt, @@ -185,8 +185,8 @@ extern ssize_t pg_pwritev_with_retry(int fd, extern int pg_truncate(const char *path, off_t length); extern void fsync_fname(const char *fname, bool isdir); extern int fsync_fname_ext(const char *fname, bool isdir, bool ignore_perm, int elevel); -extern int durable_rename(const char *oldfile, const char *newfile, int loglevel); -extern int durable_unlink(const char *fname, int loglevel); +extern int durable_rename(const char *oldfile, const char *newfile, int elevel); +extern int durable_unlink(const char *fname, int elevel); extern void SyncDataDirectory(void); extern int data_sync_elevel(int elevel); diff --git a/src/include/storage/fsm_internals.h b/src/include/storage/fsm_internals.h index a6f837217..819160c78 100644 --- a/src/include/storage/fsm_internals.h +++ b/src/include/storage/fsm_internals.h @@ -61,7 +61,7 @@ typedef FSMPageData *FSMPage; #define SlotsPerFSMPage LeafNodesPerPage /* Prototypes for functions in fsmpage.c */ -extern int fsm_search_avail(Buffer buf, uint8 min_cat, bool advancenext, +extern int fsm_search_avail(Buffer buf, uint8 minvalue, bool advancenext, bool exclusive_lock_held); extern uint8 fsm_get_avail(Page page, int slot); extern uint8 fsm_get_max_avail(Page page); diff --git a/src/include/storage/indexfsm.h b/src/include/storage/indexfsm.h index 04c1a051b..129590863 100644 --- a/src/include/storage/indexfsm.h +++ b/src/include/storage/indexfsm.h @@ -18,8 +18,8 @@ #include "utils/relcache.h" extern BlockNumber GetFreeIndexPage(Relation rel); -extern void RecordFreeIndexPage(Relation rel, BlockNumber page); -extern void RecordUsedIndexPage(Relation rel, BlockNumber page); +extern void RecordFreeIndexPage(Relation rel, BlockNumber freeBlock); +extern void RecordUsedIndexPage(Relation rel, BlockNumber usedBlock); extern void IndexFreeSpaceMapVacuum(Relation rel); diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index e03d317ee..ca4eca76f 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.h @@ -124,7 +124,7 @@ extern bool LWLockAnyHeldByMe(LWLock *lock, int nlocks, size_t stride); extern bool LWLockHeldByMeInMode(LWLock *lock, LWLockMode mode); extern bool LWLockWaitForVar(LWLock *lock, uint64 *valptr, uint64 oldval, uint64 *newval); -extern void LWLockUpdateVar(LWLock *lock, uint64 *valptr, uint64 value); +extern void LWLockUpdateVar(LWLock *lock, uint64 *valptr, uint64 val); extern Size LWLockShmemSize(void); extern void CreateLWLocks(void); diff --git a/src/include/storage/predicate.h b/src/include/storage/predicate.h index 8dfcb3944..dbef2ffb0 100644 --- a/src/include/storage/predicate.h +++ b/src/include/storage/predicate.h @@ -58,7 +58,7 @@ extern void RegisterPredicateLockingXid(TransactionId xid); extern void PredicateLockRelation(Relation relation, Snapshot snapshot); extern void PredicateLockPage(Relation relation, BlockNumber blkno, Snapshot snapshot); extern void PredicateLockTID(Relation relation, ItemPointer tid, Snapshot snapshot, - TransactionId insert_xid); + TransactionId tuple_xid); extern void PredicateLockPageSplit(Relation relation, BlockNumber oldblkno, BlockNumber newblkno); extern void PredicateLockPageCombine(Relation relation, BlockNumber oldblkno, BlockNumber newblkno); extern void TransferPredicateLocksToHeapRelation(Relation relation); diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h index 1b2cfac5a..9761f5374 100644 --- a/src/include/storage/procarray.h +++ b/src/include/storage/procarray.h @@ -57,7 +57,7 @@ extern TransactionId GetOldestNonRemovableTransactionId(Relation rel); extern TransactionId GetOldestTransactionIdConsideredRunning(void); extern TransactionId GetOldestActiveTransactionId(void); extern TransactionId GetOldestSafeDecodingTransactionId(bool catalogOnly); -extern void GetReplicationHorizons(TransactionId *slot_xmin, TransactionId *catalog_xmin); +extern void GetReplicationHorizons(TransactionId *xmin, TransactionId *catalog_xmin); extern VirtualTransactionId *GetVirtualXIDsDelayingChkpt(int *nvxids, int type); extern bool HaveVirtualXIDsDelayingChkpt(VirtualTransactionId *vxids, diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index dacef92f4..f5da98dc7 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -43,7 +43,7 @@ extern void StandbyDeadLockHandler(void); extern void StandbyTimeoutHandler(void); extern void StandbyLockTimeoutHandler(void); extern void LogRecoveryConflict(ProcSignalReason reason, TimestampTz wait_start, - TimestampTz cur_ts, VirtualTransactionId *wait_list, + TimestampTz now, VirtualTransactionId *wait_list, bool still_waiting); /* diff --git a/src/include/tcop/cmdtag.h b/src/include/tcop/cmdtag.h index b9e8992a4..60e3179c7 100644 --- a/src/include/tcop/cmdtag.h +++ b/src/include/tcop/cmdtag.h @@ -53,6 +53,6 @@ extern const char *GetCommandTagName(CommandTag commandTag); extern bool command_tag_display_rowcount(CommandTag commandTag); extern bool command_tag_event_trigger_ok(CommandTag commandTag); extern bool command_tag_table_rewrite_ok(CommandTag commandTag); -extern CommandTag GetCommandTagEnum(const char *tagname); +extern CommandTag GetCommandTagEnum(const char *commandname); #endif /* CMDTAG_H */ diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h index c36c711da..fd73b3844 100644 --- a/src/include/tsearch/ts_utils.h +++ b/src/include/tsearch/ts_utils.h @@ -32,8 +32,8 @@ typedef struct TSVectorParseStateData *TSVectorParseState; extern TSVectorParseState init_tsvector_parser(char *input, int flags); extern void reset_tsvector_parser(TSVectorParseState state, char *input); extern bool gettoken_tsvector(TSVectorParseState state, - char **token, int *len, - WordEntryPos **pos, int *poslen, + char **strval, int *lenval, + WordEntryPos **pos_ptr, int *poslen, char **endptr); extern void close_tsvector_parser(TSVectorParseState state); diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 3d6411197..9a4df3a5d 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -214,8 +214,8 @@ extern bool is_member_of_role_nosuper(Oid member, Oid role); extern bool is_admin_of_role(Oid member, Oid role); extern Oid select_best_admin(Oid member, Oid role); extern void check_is_member_of_role(Oid member, Oid role); -extern Oid get_role_oid(const char *rolename, bool missing_ok); -extern Oid get_role_oid_or_public(const char *rolename); +extern Oid get_role_oid(const char *rolname, bool missing_ok); +extern Oid get_role_oid_or_public(const char *rolname); extern Oid get_rolespec_oid(const RoleSpec *role, bool missing_ok); extern void check_rolespec_name(const RoleSpec *role, const char *detail_msg); extern HeapTuple get_rolespec_tuple(const RoleSpec *role); @@ -285,7 +285,7 @@ extern AclResult pg_parameter_acl_aclcheck(Oid acl_oid, Oid roleid, AclMode mode); extern AclResult pg_proc_aclcheck(Oid proc_oid, Oid roleid, AclMode mode); extern AclResult pg_language_aclcheck(Oid lang_oid, Oid roleid, AclMode mode); -extern AclResult pg_largeobject_aclcheck_snapshot(Oid lang_oid, Oid roleid, +extern AclResult pg_largeobject_aclcheck_snapshot(Oid lobj_oid, Oid roleid, AclMode mode, Snapshot snapshot); extern AclResult pg_namespace_aclcheck(Oid nsp_oid, Oid roleid, AclMode mode); extern AclResult pg_tablespace_aclcheck(Oid spc_oid, Oid roleid, AclMode mode); diff --git a/src/include/utils/attoptcache.h b/src/include/utils/attoptcache.h index ee37af950..49ae64721 100644 --- a/src/include/utils/attoptcache.h +++ b/src/include/utils/attoptcache.h @@ -23,6 +23,6 @@ typedef struct AttributeOpts float8 n_distinct_inherited; } AttributeOpts; -extern AttributeOpts *get_attribute_options(Oid spcid, int attnum); +extern AttributeOpts *get_attribute_options(Oid attrelid, int attnum); #endif /* ATTOPTCACHE_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 221c3e6c3..81631f164 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -47,10 +47,10 @@ extern int16 pg_strtoint16(const char *s); extern int32 pg_strtoint32(const char *s); extern int64 pg_strtoint64(const char *s); extern int pg_itoa(int16 i, char *a); -extern int pg_ultoa_n(uint32 l, char *a); -extern int pg_ulltoa_n(uint64 l, char *a); -extern int pg_ltoa(int32 l, char *a); -extern int pg_lltoa(int64 ll, char *a); +extern int pg_ultoa_n(uint32 value, char *a); +extern int pg_ulltoa_n(uint64 value, char *a); +extern int pg_ltoa(int32 value, char *a); +extern int pg_lltoa(int64 value, char *a); extern char *pg_ultostr_zeropad(char *str, uint32 value, int32 minwidth); extern char *pg_ultostr(char *str, uint32 value); diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index 4527e8251..2cae346be 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -327,7 +327,7 @@ extern int DecodeTimezoneAbbrev(int field, char *lowtoken, extern int DecodeSpecial(int field, char *lowtoken, int *val); extern int DecodeUnits(int field, char *lowtoken, int *val); -extern int j2day(int jd); +extern int j2day(int date); extern Node *TemporalSimplify(int32 max_precis, Node *node); diff --git a/src/include/utils/multirangetypes.h b/src/include/utils/multirangetypes.h index 915330f99..bc3339205 100644 --- a/src/include/utils/multirangetypes.h +++ b/src/include/utils/multirangetypes.h @@ -64,7 +64,7 @@ extern bool multirange_ne_internal(TypeCacheEntry *rangetyp, const MultirangeType *mr2); extern bool multirange_contains_elem_internal(TypeCacheEntry *rangetyp, const MultirangeType *mr, - Datum elem); + Datum val); extern bool multirange_contains_range_internal(TypeCacheEntry *rangetyp, const MultirangeType *mr, const RangeType *r); @@ -115,11 +115,11 @@ extern MultirangeType *multirange_intersect_internal(Oid mltrngtypoid, extern TypeCacheEntry *multirange_get_typcache(FunctionCallInfo fcinfo, Oid mltrngtypid); extern void multirange_deserialize(TypeCacheEntry *rangetyp, - const MultirangeType *range, + const MultirangeType *multirange, int32 *range_count, RangeType ***ranges); extern MultirangeType *make_multirange(Oid mltrngtypoid, - TypeCacheEntry *typcache, + TypeCacheEntry *rangetyp, int32 range_count, RangeType **ranges); extern MultirangeType *make_empty_multirange(Oid mltrngtypoid, TypeCacheEntry *rangetyp); diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h index 3caa74dfe..09d355e81 100644 --- a/src/include/utils/numeric.h +++ b/src/include/utils/numeric.h @@ -85,6 +85,6 @@ extern Numeric numeric_div_opt_error(Numeric num1, Numeric num2, bool *have_error); extern Numeric numeric_mod_opt_error(Numeric num1, Numeric num2, bool *have_error); -extern int32 numeric_int4_opt_error(Numeric num, bool *error); +extern int32 numeric_int4_opt_error(Numeric num, bool *have_error); #endif /* _PG_NUMERIC_H_ */ diff --git a/src/include/utils/pgstat_internal.h b/src/include/utils/pgstat_internal.h index 901d2041d..40a360285 100644 --- a/src/include/utils/pgstat_internal.h +++ b/src/include/utils/pgstat_internal.h @@ -567,7 +567,7 @@ extern void pgstat_relation_delete_pending_cb(PgStat_EntryRef *entry_ref); */ extern void pgstat_replslot_reset_timestamp_cb(PgStatShared_Common *header, TimestampTz ts); -extern void pgstat_replslot_to_serialized_name_cb(const PgStatShared_Common *tmp, NameData *name); +extern void pgstat_replslot_to_serialized_name_cb(const PgStatShared_Common *header, NameData *name); extern bool pgstat_replslot_from_serialized_name_cb(const NameData *name, PgStat_HashKey *key); @@ -579,7 +579,7 @@ extern void pgstat_attach_shmem(void); extern void pgstat_detach_shmem(void); extern PgStat_EntryRef *pgstat_get_entry_ref(PgStat_Kind kind, Oid dboid, Oid objoid, - bool create, bool *found); + bool create, bool *created_entry); extern bool pgstat_lock_entry(PgStat_EntryRef *entry_ref, bool nowait); extern bool pgstat_lock_entry_shared(PgStat_EntryRef *entry_ref, bool nowait); extern void pgstat_unlock_entry(PgStat_EntryRef *entry_ref); diff --git a/src/include/utils/rangetypes.h b/src/include/utils/rangetypes.h index 993fad4fc..b62f1ea48 100644 --- a/src/include/utils/rangetypes.h +++ b/src/include/utils/rangetypes.h @@ -141,8 +141,8 @@ extern int range_cmp_bounds(TypeCacheEntry *typcache, const RangeBound *b1, extern int range_cmp_bound_values(TypeCacheEntry *typcache, const RangeBound *b1, const RangeBound *b2); extern int range_compare(const void *key1, const void *key2, void *arg); -extern bool bounds_adjacent(TypeCacheEntry *typcache, RangeBound bound1, - RangeBound bound2); +extern bool bounds_adjacent(TypeCacheEntry *typcache, RangeBound boundA, + RangeBound boundB); extern RangeType *make_empty_range(TypeCacheEntry *typcache); extern bool range_split_internal(TypeCacheEntry *typcache, const RangeType *r1, const RangeType *r2, RangeType **output1, diff --git a/src/include/utils/regproc.h b/src/include/utils/regproc.h index a36ceba7a..0e2965ff9 100644 --- a/src/include/utils/regproc.h +++ b/src/include/utils/regproc.h @@ -28,7 +28,7 @@ extern char *format_operator_extended(Oid operator_oid, bits16 flags); extern List *stringToQualifiedNameList(const char *string); extern char *format_procedure(Oid procedure_oid); extern char *format_procedure_qualified(Oid procedure_oid); -extern void format_procedure_parts(Oid operator_oid, List **objnames, +extern void format_procedure_parts(Oid procedure_oid, List **objnames, List **objargs, bool missing_ok); extern char *format_operator(Oid operator_oid); diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index ba35d6b3b..73106b6fc 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -50,7 +50,7 @@ extern Oid RelationGetReplicaIndex(Relation relation); extern List *RelationGetIndexExpressions(Relation relation); extern List *RelationGetDummyIndexExpressions(Relation relation); extern List *RelationGetIndexPredicate(Relation relation); -extern Datum *RelationGetIndexRawAttOptions(Relation relation); +extern Datum *RelationGetIndexRawAttOptions(Relation indexrel); extern bytea **RelationGetIndexAttOptions(Relation relation, bool copy); typedef enum IndexAttrBitmapKind diff --git a/src/include/utils/relmapper.h b/src/include/utils/relmapper.h index 2bb2e255f..92f1f779a 100644 --- a/src/include/utils/relmapper.h +++ b/src/include/utils/relmapper.h @@ -37,7 +37,7 @@ typedef struct xl_relmap_update extern RelFileNumber RelationMapOidToFilenumber(Oid relationId, bool shared); -extern Oid RelationMapFilenumberToOid(RelFileNumber relationId, bool shared); +extern Oid RelationMapFilenumberToOid(RelFileNumber filenumber, bool shared); extern RelFileNumber RelationMapOidToFilenumberForDatabase(char *dbpath, Oid relationId); extern void RelationMapCopy(Oid dbid, Oid tsid, char *srcdbpath, diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index d485b9bfc..49af4ed2e 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -181,11 +181,11 @@ extern double ineq_histogram_selectivity(PlannerInfo *root, Oid collation, Datum constval, Oid consttype); extern double var_eq_const(VariableStatData *vardata, - Oid oproid, Oid collation, + Oid operator, Oid collation, Datum constval, bool constisnull, bool varonleft, bool negate); extern double var_eq_non_const(VariableStatData *vardata, - Oid oproid, Oid collation, + Oid operator, Oid collation, Node *other, bool varonleft, bool negate); diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h index 06eafdf11..9f4dd5360 100644 --- a/src/include/utils/snapmgr.h +++ b/src/include/utils/snapmgr.h @@ -169,7 +169,7 @@ extern bool XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot); /* Support for catalog timetravel for logical decoding */ struct HTAB; extern struct HTAB *HistoricSnapshotGetTupleCids(void); -extern void SetupHistoricSnapshot(Snapshot snapshot_now, struct HTAB *tuplecids); +extern void SetupHistoricSnapshot(Snapshot historic_snapshot, struct HTAB *tuplecids); extern void TeardownHistoricSnapshot(bool is_error); extern bool HistoricSnapshotActive(void); diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index edf3a9731..820c08941 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -83,10 +83,10 @@ extern pg_time_t timestamptz_to_time_t(TimestampTz t); extern const char *timestamptz_to_str(TimestampTz t); -extern int tm2timestamp(struct pg_tm *tm, fsec_t fsec, int *tzp, Timestamp *dt); +extern int tm2timestamp(struct pg_tm *tm, fsec_t fsec, int *tzp, Timestamp *result); extern int timestamp2tm(Timestamp dt, int *tzp, struct pg_tm *tm, fsec_t *fsec, const char **tzn, pg_tz *attimezone); -extern void dt2time(Timestamp dt, int *hour, int *min, int *sec, fsec_t *fsec); +extern void dt2time(Timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec); extern void interval2itm(Interval span, struct pg_itm *itm); extern int itm2interval(struct pg_itm *itm, Interval *span); diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index e82b5a638..444127499 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -372,7 +372,7 @@ extern const char *tuplesort_space_type_name(TuplesortSpaceType t); extern int tuplesort_merge_order(int64 allowedMem); -extern Size tuplesort_estimate_shared(int nworkers); +extern Size tuplesort_estimate_shared(int nWorkers); extern void tuplesort_initialize_shared(Sharedsort *shared, int nWorkers, dsm_segment *seg); extern void tuplesort_attach_shared(Sharedsort *shared, dsm_segment *seg); diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h index 6620a6261..bfd0abf9c 100644 --- a/src/include/utils/xml.h +++ b/src/include/utils/xml.h @@ -64,7 +64,7 @@ extern xmltype *xmlconcat(List *args); extern xmltype *xmlelement(XmlExpr *xexpr, Datum *named_argvalue, bool *named_argnull, Datum *argvalue, bool *argnull); -extern xmltype *xmlparse(text *data, XmlOptionType xmloption, bool preserve_whitespace); +extern xmltype *xmlparse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace); extern xmltype *xmlpi(const char *target, text *arg, bool arg_is_null, bool *result_is_null); extern xmltype *xmlroot(xmltype *data, text *version, int standalone); extern bool xml_is_document(xmltype *arg); diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c index dbad77643..ed16f93ac 100644 --- a/src/backend/access/brin/brin_minmax_multi.c +++ b/src/backend/access/brin/brin_minmax_multi.c @@ -223,7 +223,8 @@ typedef struct SerializedRanges static SerializedRanges *brin_range_serialize(Ranges *range); -static Ranges *brin_range_deserialize(int maxvalues, SerializedRanges *range); +static Ranges *brin_range_deserialize(int maxvalues, + SerializedRanges *serialized); /* diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 0aa4b334a..6458a9c27 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -733,11 +733,11 @@ add_reloption(relopt_gen *newoption) * 'relopt_struct_size'. */ void -init_local_reloptions(local_relopts *opts, Size relopt_struct_size) +init_local_reloptions(local_relopts *relopts, Size relopt_struct_size) { - opts->options = NIL; - opts->validators = NIL; - opts->relopt_struct_size = relopt_struct_size; + relopts->options = NIL; + relopts->validators = NIL; + relopts->relopt_struct_size = relopt_struct_size; } /* @@ -746,9 +746,9 @@ init_local_reloptions(local_relopts *opts, Size relopt_struct_size) * build_local_reloptions(). */ void -register_reloptions_validator(local_relopts *opts, relopts_validator validator) +register_reloptions_validator(local_relopts *relopts, relopts_validator validator) { - opts->validators = lappend(opts->validators, validator); + relopts->validators = lappend(relopts->validators, validator); } /* diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c index 374e64e80..fb0f46670 100644 --- a/src/backend/access/gist/gistbuild.c +++ b/src/backend/access/gist/gistbuild.c @@ -162,7 +162,7 @@ static BlockNumber gistbufferinginserttuples(GISTBuildState *buildstate, BlockNumber parentblk, OffsetNumber downlinkoffnum); static Buffer gistBufferingFindCorrectParent(GISTBuildState *buildstate, BlockNumber childblkno, int level, - BlockNumber *parentblk, + BlockNumber *parentblkno, OffsetNumber *downlinkoffnum); static void gistProcessEmptyingQueue(GISTBuildState *buildstate); static void gistEmptyAllBuffers(GISTBuildState *buildstate); @@ -171,7 +171,8 @@ static int gistGetMaxLevel(Relation index); static void gistInitParentMap(GISTBuildState *buildstate); static void gistMemorizeParent(GISTBuildState *buildstate, BlockNumber child, BlockNumber parent); -static void gistMemorizeAllDownlinks(GISTBuildState *buildstate, Buffer parent); +static void gistMemorizeAllDownlinks(GISTBuildState *buildstate, + Buffer parentbuf); static BlockNumber gistGetParent(GISTBuildState *buildstate, BlockNumber child); diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c index c6c7dfe4c..538e3880c 100644 --- a/src/backend/access/gist/gistbuildbuffers.c +++ b/src/backend/access/gist/gistbuildbuffers.c @@ -31,9 +31,9 @@ static void gistLoadNodeBuffer(GISTBuildBuffers *gfbb, static void gistUnloadNodeBuffer(GISTBuildBuffers *gfbb, GISTNodeBuffer *nodeBuffer); static void gistPlaceItupToPage(GISTNodeBufferPage *pageBuffer, - IndexTuple item); + IndexTuple itup); static void gistGetItupFromPage(GISTNodeBufferPage *pageBuffer, - IndexTuple *item); + IndexTuple *itup); static long gistBuffersGetFreeBlock(GISTBuildBuffers *gfbb); static void gistBuffersReleaseBlock(GISTBuildBuffers *gfbb, long blocknum); diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c index f190decdf..0aa6e58a6 100644 --- a/src/backend/access/gist/gistvacuum.c +++ b/src/backend/access/gist/gistvacuum.c @@ -49,7 +49,7 @@ static void gistvacuumpage(GistVacState *vstate, BlockNumber blkno, static void gistvacuum_delete_empty_pages(IndexVacuumInfo *info, GistVacState *vstate); static bool gistdeletepage(IndexVacuumInfo *info, IndexBulkDeleteResult *stats, - Buffer buffer, OffsetNumber downlink, + Buffer parentBuffer, OffsetNumber downlink, Buffer leafBuffer); /* diff --git a/src/backend/access/transam/generic_xlog.c b/src/backend/access/transam/generic_xlog.c index bbb542b32..6db9a1fca 100644 --- a/src/backend/access/transam/generic_xlog.c +++ b/src/backend/access/transam/generic_xlog.c @@ -69,7 +69,7 @@ struct GenericXLogState }; static void writeFragment(PageData *pageData, OffsetNumber offset, - OffsetNumber len, const char *data); + OffsetNumber length, const char *data); static void computeRegionDelta(PageData *pageData, const char *curpage, const char *targetpage, int targetStart, int targetEnd, diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 50f092d7e..5eec4df47 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -354,7 +354,7 @@ static void AtSubStart_Memory(void); static void AtSubStart_ResourceOwner(void); static void ShowTransactionState(const char *str); -static void ShowTransactionStateRec(const char *str, TransactionState state); +static void ShowTransactionStateRec(const char *str, TransactionState s); static const char *BlockStateAsString(TBlockState blockState); static const char *TransStateAsString(TransState state); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 81d339d57..eb0430fe9 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -648,7 +648,7 @@ static void XLogReportParameters(void); static int LocalSetXLogInsertAllowed(void); static void CreateEndOfRecoveryRecord(void); static XLogRecPtr CreateOverwriteContrecordRecord(XLogRecPtr aborted_lsn, - XLogRecPtr missingContrecPtr, + XLogRecPtr pagePtr, TimeLineID newTLI); static void CheckPointGuts(XLogRecPtr checkPointRedo, int flags); static void KeepLogSeg(XLogRecPtr recptr, XLogSegNo *logSegNo); diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c index 24f9755e5..5ca15ebbf 100644 --- a/src/backend/access/transam/xloginsert.c +++ b/src/backend/access/transam/xloginsert.c @@ -1094,7 +1094,7 @@ XLogSaveBufferForHint(Buffer buffer, bool buffer_std) * the unused space to be left out from the WAL record, making it smaller. */ XLogRecPtr -log_newpage(RelFileLocator *rlocator, ForkNumber forkNum, BlockNumber blkno, +log_newpage(RelFileLocator *rlocator, ForkNumber forknum, BlockNumber blkno, Page page, bool page_std) { int flags; @@ -1105,7 +1105,7 @@ log_newpage(RelFileLocator *rlocator, ForkNumber forkNum, BlockNumber blkno, flags |= REGBUF_STANDARD; XLogBeginInsert(); - XLogRegisterBlock(0, rlocator, forkNum, blkno, page, flags); + XLogRegisterBlock(0, rlocator, forknum, blkno, page, flags); recptr = XLogInsert(RM_XLOG_ID, XLOG_FPI); /* @@ -1126,7 +1126,7 @@ log_newpage(RelFileLocator *rlocator, ForkNumber forkNum, BlockNumber blkno, * because we can write multiple pages in a single WAL record. */ void -log_newpages(RelFileLocator *rlocator, ForkNumber forkNum, int num_pages, +log_newpages(RelFileLocator *rlocator, ForkNumber forknum, int num_pages, BlockNumber *blknos, Page *pages, bool page_std) { int flags; @@ -1156,7 +1156,7 @@ log_newpages(RelFileLocator *rlocator, ForkNumber forkNum, int num_pages, nbatch = 0; while (nbatch < XLR_MAX_BLOCK_ID && i < num_pages) { - XLogRegisterBlock(nbatch, rlocator, forkNum, blknos[i], pages[i], flags); + XLogRegisterBlock(nbatch, rlocator, forknum, blknos[i], pages[i], flags); i++; nbatch++; } @@ -1192,15 +1192,15 @@ log_newpage_buffer(Buffer buffer, bool page_std) { Page page = BufferGetPage(buffer); RelFileLocator rlocator; - ForkNumber forkNum; + ForkNumber forknum; BlockNumber blkno; /* Shared buffers should be modified in a critical section. */ Assert(CritSectionCount > 0); - BufferGetTag(buffer, &rlocator, &forkNum, &blkno); + BufferGetTag(buffer, &rlocator, &forknum, &blkno); - return log_newpage(&rlocator, forkNum, blkno, page, page_std); + return log_newpage(&rlocator, forknum, blkno, page, page_std); } /* @@ -1221,7 +1221,7 @@ log_newpage_buffer(Buffer buffer, bool page_std) * cause a deadlock through some other means. */ void -log_newpage_range(Relation rel, ForkNumber forkNum, +log_newpage_range(Relation rel, ForkNumber forknum, BlockNumber startblk, BlockNumber endblk, bool page_std) { @@ -1253,7 +1253,7 @@ log_newpage_range(Relation rel, ForkNumber forkNum, nbufs = 0; while (nbufs < XLR_MAX_BLOCK_ID && blkno < endblk) { - Buffer buf = ReadBufferExtended(rel, forkNum, blkno, + Buffer buf = ReadBufferExtended(rel, forknum, blkno, RBM_NORMAL, NULL); LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE); diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index 050d2f424..c1c9f1995 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -47,7 +47,7 @@ static bool allocate_recordbuf(XLogReaderState *state, uint32 reclength); static int ReadPageInternal(XLogReaderState *state, XLogRecPtr pageptr, int reqLen); static void XLogReaderInvalReadState(XLogReaderState *state); -static XLogPageReadResult XLogDecodeNextRecord(XLogReaderState *state, bool non_blocking); +static XLogPageReadResult XLogDecodeNextRecord(XLogReaderState *state, bool nonblocking); static bool ValidXLogRecordHeader(XLogReaderState *state, XLogRecPtr RecPtr, XLogRecPtr PrevRecPtr, XLogRecord *record, bool randAccess); static bool ValidXLogRecord(XLogReaderState *state, XLogRecord *record, diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c index 1f1cff1a5..dd103a868 100644 --- a/src/backend/backup/basebackup.c +++ b/src/backend/backup/basebackup.c @@ -74,7 +74,7 @@ typedef struct pg_checksum_type manifest_checksum_type; } basebackup_options; -static int64 sendTablespace(bbsink *sink, char *path, char *oid, bool sizeonly, +static int64 sendTablespace(bbsink *sink, char *path, char *spcoid, bool sizeonly, struct backup_manifest_info *manifest); static int64 sendDir(bbsink *sink, const char *path, int basepathlen, bool sizeonly, List *tablespaces, bool sendtblspclinks, diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 58752368e..22635f809 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -463,19 +463,19 @@ boot_openrel(char *relname) * ---------------- */ void -closerel(char *name) +closerel(char *relname) { - if (name) + if (relname) { if (boot_reldesc) { - if (strcmp(RelationGetRelationName(boot_reldesc), name) != 0) + if (strcmp(RelationGetRelationName(boot_reldesc), relname) != 0) elog(ERROR, "close of %s when %s was expected", - name, RelationGetRelationName(boot_reldesc)); + relname, RelationGetRelationName(boot_reldesc)); } else elog(ERROR, "close of %s before any relation was opened", - name); + relname); } if (boot_reldesc == NULL) diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index b20974bbe..6c7b05847 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -104,17 +104,17 @@ typedef struct bool binary_upgrade_record_init_privs = false; static void ExecGrantStmt_oids(InternalGrant *istmt); -static void ExecGrant_Relation(InternalGrant *grantStmt); -static void ExecGrant_Database(InternalGrant *grantStmt); -static void ExecGrant_Fdw(InternalGrant *grantStmt); -static void ExecGrant_ForeignServer(InternalGrant *grantStmt); -static void ExecGrant_Function(InternalGrant *grantStmt); -static void ExecGrant_Language(InternalGrant *grantStmt); -static void ExecGrant_Largeobject(InternalGrant *grantStmt); -static void ExecGrant_Namespace(InternalGrant *grantStmt); -static void ExecGrant_Tablespace(InternalGrant *grantStmt); -static void ExecGrant_Type(InternalGrant *grantStmt); -static void ExecGrant_Parameter(InternalGrant *grantStmt); +static void ExecGrant_Relation(InternalGrant *istmt); +static void ExecGrant_Database(InternalGrant *istmt); +static void ExecGrant_Fdw(InternalGrant *istmt); +static void ExecGrant_ForeignServer(InternalGrant *istmt); +static void ExecGrant_Function(InternalGrant *istmt); +static void ExecGrant_Language(InternalGrant *istmt); +static void ExecGrant_Largeobject(InternalGrant *istmt); +static void ExecGrant_Namespace(InternalGrant *istmt); +static void ExecGrant_Tablespace(InternalGrant *istmt); +static void ExecGrant_Type(InternalGrant *istmt); +static void ExecGrant_Parameter(InternalGrant *istmt); static void SetDefaultACLsInSchemas(InternalDefaultACL *iacls, List *nspnames); static void SetDefaultACL(InternalDefaultACL *iacls); diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index dbb4b008a..a7022824d 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -3644,7 +3644,7 @@ PopOverrideSearchPath(void) * database's encoding. */ Oid -get_collation_oid(List *name, bool missing_ok) +get_collation_oid(List *collname, bool missing_ok) { char *schemaname; char *collation_name; @@ -3654,7 +3654,7 @@ get_collation_oid(List *name, bool missing_ok) ListCell *l; /* deconstruct the name list */ - DeconstructQualifiedName(name, &schemaname, &collation_name); + DeconstructQualifiedName(collname, &schemaname, &collation_name); if (schemaname) { @@ -3690,7 +3690,7 @@ get_collation_oid(List *name, bool missing_ok) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("collation \"%s\" for encoding \"%s\" does not exist", - NameListToString(name), GetDatabaseEncodingName()))); + NameListToString(collname), GetDatabaseEncodingName()))); return InvalidOid; } @@ -3698,7 +3698,7 @@ get_collation_oid(List *name, bool missing_ok) * get_conversion_oid - find a conversion by possibly qualified name */ Oid -get_conversion_oid(List *name, bool missing_ok) +get_conversion_oid(List *conname, bool missing_ok) { char *schemaname; char *conversion_name; @@ -3707,7 +3707,7 @@ get_conversion_oid(List *name, bool missing_ok) ListCell *l; /* deconstruct the name list */ - DeconstructQualifiedName(name, &schemaname, &conversion_name); + DeconstructQualifiedName(conname, &schemaname, &conversion_name); if (schemaname) { @@ -3745,7 +3745,7 @@ get_conversion_oid(List *name, bool missing_ok) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("conversion \"%s\" does not exist", - NameListToString(name)))); + NameListToString(conname)))); return conoid; } diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index f248ad42b..308dc93f6 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -125,9 +125,9 @@ static bool have_createdb_privilege(void); static void remove_dbtablespaces(Oid db_id); static bool check_db_file_conflict(Oid db_id); static int errdetail_busy_db(int notherbackends, int npreparedxacts); -static void CreateDatabaseUsingWalLog(Oid src_dboid, Oid dboid, Oid src_tsid, +static void CreateDatabaseUsingWalLog(Oid src_dboid, Oid dst_dboid, Oid src_tsid, Oid dst_tsid); -static List *ScanSourceDatabasePgClass(Oid srctbid, Oid srcdbid, char *srcpath); +static List *ScanSourceDatabasePgClass(Oid tbid, Oid dbid, char *srcpath); static List *ScanSourceDatabasePgClassPage(Page page, Buffer buf, Oid tbid, Oid dbid, char *srcpath, List *rlocatorlist, Snapshot snapshot); @@ -136,8 +136,8 @@ static CreateDBRelInfo *ScanSourceDatabasePgClassTuple(HeapTupleData *tuple, char *srcpath); static void CreateDirAndVersionFile(char *dbpath, Oid dbid, Oid tsid, bool isRedo); -static void CreateDatabaseUsingFileCopy(Oid src_dboid, Oid dboid, Oid src_tsid, - Oid dst_tsid); +static void CreateDatabaseUsingFileCopy(Oid src_dboid, Oid dst_dboid, + Oid src_tsid, Oid dst_tsid); static void recovery_create_dbdir(char *path, bool only_tblspc); /* diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index 635d05405..441f29d68 100644 --- a/src/backend/commands/event_trigger.c +++ b/src/backend/commands/event_trigger.c @@ -94,7 +94,7 @@ static void AlterEventTriggerOwner_internal(Relation rel, static void error_duplicate_filter_variable(const char *defname); static Datum filter_list_to_array(List *filterlist); static Oid insert_event_trigger_tuple(const char *trigname, const char *eventname, - Oid evtOwner, Oid funcoid, List *tags); + Oid evtOwner, Oid funcoid, List *taglist); static void validate_ddl_tags(const char *filtervar, List *taglist); static void validate_table_rewrite_tags(const char *filtervar, List *taglist); static void EventTriggerInvoke(List *fn_oid_list, EventTriggerData *trigdata); diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 053d2ca5a..f86983c66 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -111,7 +111,7 @@ static void show_incremental_sort_info(IncrementalSortState *incrsortstate, static void show_hash_info(HashState *hashstate, ExplainState *es); static void show_memoize_info(MemoizeState *mstate, List *ancestors, ExplainState *es); -static void show_hashagg_info(AggState *hashstate, ExplainState *es); +static void show_hashagg_info(AggState *aggstate, ExplainState *es); static void show_tidbitmap_info(BitmapHeapScanState *planstate, ExplainState *es); static void show_instrumentation_count(const char *qlabel, int which, diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index cf98d9e60..fd56066c1 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -98,7 +98,7 @@ static Oid ReindexTable(RangeVar *relation, ReindexParams *params, bool isTopLevel); static void ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind, ReindexParams *params); -static void reindex_error_callback(void *args); +static void reindex_error_callback(void *arg); static void ReindexPartitions(Oid relid, ReindexParams *params, bool isTopLevel); static void ReindexMultipleInternal(List *relids, diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c index b97b8b043..b0747ce29 100644 --- a/src/backend/commands/lockcmds.c +++ b/src/backend/commands/lockcmds.c @@ -29,7 +29,7 @@ #include "utils/syscache.h" static void LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait); -static AclResult LockTableAclCheck(Oid relid, LOCKMODE lockmode, Oid userid); +static AclResult LockTableAclCheck(Oid reloid, LOCKMODE lockmode, Oid userid); static void RangeVarCallbackForLockTable(const RangeVar *rv, Oid relid, Oid oldrelid, void *arg); static void LockViewRecurse(Oid reloid, LOCKMODE lockmode, bool nowait, diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 7a931ab75..775553ec7 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -52,7 +52,7 @@ static void AlterOpFamilyAdd(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid, int maxOpNumber, int maxProcNumber, - int opclassOptsProcNumber, List *items); + int optsProcNumber, List *items); static void AlterOpFamilyDrop(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid, int maxOpNumber, int maxProcNumber, diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index a583aa430..134610497 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -285,16 +285,16 @@ RenameSchema(const char *oldname, const char *newname) } void -AlterSchemaOwner_oid(Oid oid, Oid newOwnerId) +AlterSchemaOwner_oid(Oid schemaoid, Oid newOwnerId) { HeapTuple tup; Relation rel; rel = table_open(NamespaceRelationId, RowExclusiveLock); - tup = SearchSysCache1(NAMESPACEOID, ObjectIdGetDatum(oid)); + tup = SearchSysCache1(NAMESPACEOID, ObjectIdGetDatum(schemaoid)); if (!HeapTupleIsValid(tup)) - elog(ERROR, "cache lookup failed for schema %u", oid); + elog(ERROR, "cache lookup failed for schema %u", schemaoid); AlterSchemaOwner_internal(tup, rel, newOwnerId); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index e3233a8f3..6c52edd9b 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -550,7 +550,7 @@ static ObjectAddress ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel, AlterTableCmd *cmd, LOCKMODE lockmode); static void RememberConstraintForRebuilding(Oid conoid, AlteredTableInfo *tab); static void RememberIndexForRebuilding(Oid indoid, AlteredTableInfo *tab); -static void RememberStatisticsForRebuilding(Oid indoid, AlteredTableInfo *tab); +static void RememberStatisticsForRebuilding(Oid stxoid, AlteredTableInfo *tab); static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode); static void ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId, @@ -610,7 +610,7 @@ static void ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partPa List **partexprs, Oid *partopclass, Oid *partcollation, char strategy); static void CreateInheritance(Relation child_rel, Relation parent_rel); static void RemoveInheritance(Relation child_rel, Relation parent_rel, - bool allow_detached); + bool expect_detached); static ObjectAddress ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd, AlterTableUtilityContext *context); @@ -627,7 +627,7 @@ static ObjectAddress ATExecDetachPartition(List **wqueue, AlteredTableInfo *tab, static void DetachPartitionFinalize(Relation rel, Relation partRel, bool concurrent, Oid defaultPartOid); static ObjectAddress ATExecDetachPartitionFinalize(Relation rel, RangeVar *name); -static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, Relation rel, +static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, Relation parentIdx, RangeVar *name); static void validatePartitionedIndex(Relation partedIdx, Relation partedTbl); static void refuseDupeIndexAttach(Relation parentIdx, Relation partIdx, diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 5ad18d2de..6f5a5262c 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -86,8 +86,8 @@ static bool GetTupleForTrigger(EState *estate, ItemPointer tid, LockTupleMode lockmode, TupleTableSlot *oldslot, - TupleTableSlot **newSlot, - TM_FailureData *tmfpd); + TupleTableSlot **epqslot, + TM_FailureData *tmfdp); static bool TriggerEnabled(EState *estate, ResultRelInfo *relinfo, Trigger *trigger, TriggerEvent event, Bitmapset *modifiedCols, @@ -101,7 +101,7 @@ static void AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo, ResultRelInfo *src_partinfo, ResultRelInfo *dst_partinfo, int event, bool row_trigger, - TupleTableSlot *oldtup, TupleTableSlot *newtup, + TupleTableSlot *oldslot, TupleTableSlot *newslot, List *recheckIndexes, Bitmapset *modifiedCols, TransitionCaptureState *transition_capture, bool is_crosspart_update); @@ -3871,7 +3871,7 @@ static void TransitionTableAddTuple(EState *estate, Tuplestorestate *tuplestore); static void AfterTriggerFreeQuery(AfterTriggersQueryData *qs); static SetConstraintState SetConstraintStateCreate(int numalloc); -static SetConstraintState SetConstraintStateCopy(SetConstraintState state); +static SetConstraintState SetConstraintStateCopy(SetConstraintState origstate); static SetConstraintState SetConstraintStateAddItem(SetConstraintState state, Oid tgoid, bool tgisdeferred); static void cancel_prior_stmt_triggers(Oid relid, CmdType cmdType, int tgevent); diff --git a/src/backend/executor/execIndexing.c b/src/backend/executor/execIndexing.c index 6a8735edf..1f1181b56 100644 --- a/src/backend/executor/execIndexing.c +++ b/src/backend/executor/execIndexing.c @@ -130,7 +130,7 @@ static bool check_exclusion_or_unique_constraint(Relation heap, Relation index, Datum *values, bool *isnull, EState *estate, bool newIndex, CEOUC_WAIT_MODE waitMode, - bool errorOK, + bool violationOK, ItemPointer conflictTid); static bool index_recheck_constraint(Relation index, Oid *constr_procs, diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c index f1fd7f7e8..99512826c 100644 --- a/src/backend/executor/execParallel.c +++ b/src/backend/executor/execParallel.c @@ -126,9 +126,9 @@ typedef struct ExecParallelInitializeDSMContext /* Helper functions that run in the parallel leader. */ static char *ExecSerializePlan(Plan *plan, EState *estate); -static bool ExecParallelEstimate(PlanState *node, +static bool ExecParallelEstimate(PlanState *planstate, ExecParallelEstimateContext *e); -static bool ExecParallelInitializeDSM(PlanState *node, +static bool ExecParallelInitializeDSM(PlanState *planstate, ExecParallelInitializeDSMContext *d); static shm_mq_handle **ExecParallelSetupTupleQueues(ParallelContext *pcxt, bool reinitialize); diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 933c30490..fe74e4981 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -396,7 +396,7 @@ static void prepare_projection_slot(AggState *aggstate, TupleTableSlot *slot, int currentSet); static void finalize_aggregates(AggState *aggstate, - AggStatePerAgg peragg, + AggStatePerAgg peraggs, AggStatePerGroup pergroup); static TupleTableSlot *project_aggregates(AggState *aggstate); static void find_cols(AggState *aggstate, Bitmapset **aggregated, @@ -407,12 +407,11 @@ static void build_hash_table(AggState *aggstate, int setno, long nbuckets); static void hashagg_recompile_expressions(AggState *aggstate, bool minslot, bool nullcheck); static long hash_choose_num_buckets(double hashentrysize, - long estimated_nbuckets, - Size memory); + long ngroups, Size memory); static int hash_choose_num_partitions(double input_groups, double hashentrysize, int used_bits, - int *log2_npartittions); + int *log2_npartitions); static void initialize_hash_entry(AggState *aggstate, TupleHashTable hashtable, TupleHashEntry entry); @@ -432,11 +431,11 @@ static HashAggBatch *hashagg_batch_new(LogicalTape *input_tape, int setno, int64 input_tuples, double input_card, int used_bits); static MinimalTuple hashagg_batch_read(HashAggBatch *batch, uint32 *hashp); -static void hashagg_spill_init(HashAggSpill *spill, LogicalTapeSet *lts, +static void hashagg_spill_init(HashAggSpill *spill, LogicalTapeSet *tapeset, int used_bits, double input_groups, double hashentrysize); static Size hashagg_spill_tuple(AggState *aggstate, HashAggSpill *spill, - TupleTableSlot *slot, uint32 hash); + TupleTableSlot *inputslot, uint32 hash); static void hashagg_spill_finish(AggState *aggstate, HashAggSpill *spill, int setno); static Datum GetAggInitVal(Datum textInitVal, Oid transtype); diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 77dd1dae8..6622b202c 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -62,9 +62,9 @@ static HashJoinTuple ExecParallelHashTupleAlloc(HashJoinTable hashtable, dsa_pointer *shared); static void MultiExecPrivateHash(HashState *node); static void MultiExecParallelHash(HashState *node); -static inline HashJoinTuple ExecParallelHashFirstTuple(HashJoinTable table, +static inline HashJoinTuple ExecParallelHashFirstTuple(HashJoinTable hashtable, int bucketno); -static inline HashJoinTuple ExecParallelHashNextTuple(HashJoinTable table, +static inline HashJoinTuple ExecParallelHashNextTuple(HashJoinTable hashtable, HashJoinTuple tuple); static inline void ExecParallelHashPushTuple(dsa_pointer_atomic *head, HashJoinTuple tuple, @@ -73,7 +73,7 @@ static void ExecParallelHashJoinSetUpBatches(HashJoinTable hashtable, int nbatch static void ExecParallelHashEnsureBatchAccessors(HashJoinTable hashtable); static void ExecParallelHashRepartitionFirst(HashJoinTable hashtable); static void ExecParallelHashRepartitionRest(HashJoinTable hashtable); -static HashMemoryChunk ExecParallelHashPopChunkQueue(HashJoinTable table, +static HashMemoryChunk ExecParallelHashPopChunkQueue(HashJoinTable hashtable, dsa_pointer *shared); static bool ExecParallelHashTuplePrealloc(HashJoinTable hashtable, int batchno, diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 87403e247..2718c2113 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -145,7 +145,7 @@ static TupleTableSlot *ExecHashJoinGetSavedTuple(HashJoinState *hjstate, TupleTableSlot *tupleSlot); static bool ExecHashJoinNewBatch(HashJoinState *hjstate); static bool ExecParallelHashJoinNewBatch(HashJoinState *hjstate); -static void ExecParallelHashJoinPartitionOuter(HashJoinState *node); +static void ExecParallelHashJoinPartitionOuter(HashJoinState *hjstate); /* ---------------------------------------------------------------- @@ -1502,11 +1502,11 @@ ExecHashJoinInitializeDSM(HashJoinState *state, ParallelContext *pcxt) * ---------------------------------------------------------------- */ void -ExecHashJoinReInitializeDSM(HashJoinState *state, ParallelContext *cxt) +ExecHashJoinReInitializeDSM(HashJoinState *state, ParallelContext *pcxt) { int plan_node_id = state->js.ps.plan->plan_node_id; ParallelHashJoinState *pstate = - shm_toc_lookup(cxt->toc, plan_node_id, false); + shm_toc_lookup(pcxt->toc, plan_node_id, false); /* * It would be possible to reuse the shared hash table in single-batch diff --git a/src/backend/executor/nodeMemoize.c b/src/backend/executor/nodeMemoize.c index d2bceb97c..7bfe02464 100644 --- a/src/backend/executor/nodeMemoize.c +++ b/src/backend/executor/nodeMemoize.c @@ -133,8 +133,8 @@ typedef struct MemoizeEntry static uint32 MemoizeHash_hash(struct memoize_hash *tb, const MemoizeKey *key); static bool MemoizeHash_equal(struct memoize_hash *tb, - const MemoizeKey *params1, - const MemoizeKey *params2); + const MemoizeKey *key1, + const MemoizeKey *key2); #define SH_PREFIX memoize #define SH_ELEMENT_TYPE MemoizeEntry diff --git a/src/backend/lib/bloomfilter.c b/src/backend/lib/bloomfilter.c index 465ca7cf6..3ef67d35a 100644 --- a/src/backend/lib/bloomfilter.c +++ b/src/backend/lib/bloomfilter.c @@ -55,7 +55,7 @@ static int my_bloom_power(uint64 target_bitset_bits); static int optimal_k(uint64 bitset_bits, int64 total_elems); static void k_hashes(bloom_filter *filter, uint32 *hashes, unsigned char *elem, size_t len); -static inline uint32 mod_m(uint32 a, uint64 m); +static inline uint32 mod_m(uint32 val, uint64 m); /* * Create Bloom filter in caller's memory context. We aim for a false positive diff --git a/src/backend/lib/dshash.c b/src/backend/lib/dshash.c index c5c032a59..d39cde9cc 100644 --- a/src/backend/lib/dshash.c +++ b/src/backend/lib/dshash.c @@ -167,7 +167,7 @@ struct dshash_table static void delete_item(dshash_table *hash_table, dshash_table_item *item); -static void resize(dshash_table *hash_table, size_t new_size); +static void resize(dshash_table *hash_table, size_t new_size_log2); static inline void ensure_valid_bucket_pointers(dshash_table *hash_table); static inline dshash_table_item *find_in_bucket(dshash_table *hash_table, const void *key, diff --git a/src/backend/lib/integerset.c b/src/backend/lib/integerset.c index 41d3abdb0..345cd1b3a 100644 --- a/src/backend/lib/integerset.c +++ b/src/backend/lib/integerset.c @@ -264,9 +264,9 @@ static void intset_update_upper(IntegerSet *intset, int level, intset_node *child, uint64 child_key); static void intset_flush_buffered_values(IntegerSet *intset); -static int intset_binsrch_uint64(uint64 value, uint64 *arr, int arr_elems, +static int intset_binsrch_uint64(uint64 item, uint64 *arr, int arr_elems, bool nextkey); -static int intset_binsrch_leaf(uint64 value, leaf_item *arr, int arr_elems, +static int intset_binsrch_leaf(uint64 item, leaf_item *arr, int arr_elems, bool nextkey); static uint64 simple8b_encode(const uint64 *ints, int *num_encoded, uint64 base); diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 035655738..cb702e0fd 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -62,10 +62,10 @@ static BIO_METHOD *my_BIO_s_socket(void); static int my_SSL_set_fd(Port *port, int fd); static DH *load_dh_file(char *filename, bool isServerStart); -static DH *load_dh_buffer(const char *, size_t); +static DH *load_dh_buffer(const char *buffer, size_t len); static int ssl_external_passwd_cb(char *buf, int size, int rwflag, void *userdata); static int dummy_ssl_passwd_cb(char *buf, int size, int rwflag, void *userdata); -static int verify_cb(int, X509_STORE_CTX *); +static int verify_cb(int ok, X509_STORE_CTX *ctx); static void info_cb(const SSL *ssl, int type, int args); static bool initialize_dh(SSL_CTX *context, bool isServerStart); static bool initialize_ecdh(SSL_CTX *context, bool isServerStart); diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c index 50f678a49..fd3f6894d 100644 --- a/src/backend/optimizer/geqo/geqo_selection.c +++ b/src/backend/optimizer/geqo/geqo_selection.c @@ -42,7 +42,7 @@ #include "optimizer/geqo_random.h" #include "optimizer/geqo_selection.h" -static int linear_rand(PlannerInfo *root, int max, double bias); +static int linear_rand(PlannerInfo *root, int pool_size, double bias); /* diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index f486d4244..a4f581e8c 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -2517,38 +2517,38 @@ append_nonpartial_cost(List *subpaths, int numpaths, int parallel_workers) * Determines and returns the cost of an Append node. */ void -cost_append(AppendPath *apath, PlannerInfo *root) +cost_append(AppendPath *path, PlannerInfo *root) { ListCell *l; - apath->path.startup_cost = 0; - apath->path.total_cost = 0; - apath->path.rows = 0; + path->path.startup_cost = 0; + path->path.total_cost = 0; + path->path.rows = 0; - if (apath->subpaths == NIL) + if (path->subpaths == NIL) return; - if (!apath->path.parallel_aware) + if (!path->path.parallel_aware) { - List *pathkeys = apath->path.pathkeys; + List *pathkeys = path->path.pathkeys; if (pathkeys == NIL) { - Path *subpath = (Path *) linitial(apath->subpaths); + Path *subpath = (Path *) linitial(path->subpaths); /* * For an unordered, non-parallel-aware Append we take the startup * cost as the startup cost of the first subpath. */ - apath->path.startup_cost = subpath->startup_cost; + path->path.startup_cost = subpath->startup_cost; /* Compute rows and costs as sums of subplan rows and costs. */ - foreach(l, apath->subpaths) + foreach(l, path->subpaths) { Path *subpath = (Path *) lfirst(l); - apath->path.rows += subpath->rows; - apath->path.total_cost += subpath->total_cost; + path->path.rows += subpath->rows; + path->path.total_cost += subpath->total_cost; } } else @@ -2571,7 +2571,7 @@ cost_append(AppendPath *apath, PlannerInfo *root) * account for possibly injecting sorts into subpaths that aren't * natively ordered. */ - foreach(l, apath->subpaths) + foreach(l, path->subpaths) { Path *subpath = (Path *) lfirst(l); Path sort_path; /* dummy for result of cost_sort */ @@ -2592,26 +2592,26 @@ cost_append(AppendPath *apath, PlannerInfo *root) subpath->pathtarget->width, 0.0, work_mem, - apath->limit_tuples); + path->limit_tuples); subpath = &sort_path; } - apath->path.rows += subpath->rows; - apath->path.startup_cost += subpath->startup_cost; - apath->path.total_cost += subpath->total_cost; + path->path.rows += subpath->rows; + path->path.startup_cost += subpath->startup_cost; + path->path.total_cost += subpath->total_cost; } } } else /* parallel-aware */ { int i = 0; - double parallel_divisor = get_parallel_divisor(&apath->path); + double parallel_divisor = get_parallel_divisor(&path->path); /* Parallel-aware Append never produces ordered output. */ - Assert(apath->path.pathkeys == NIL); + Assert(path->path.pathkeys == NIL); /* Calculate startup cost. */ - foreach(l, apath->subpaths) + foreach(l, path->subpaths) { Path *subpath = (Path *) lfirst(l); @@ -2621,10 +2621,10 @@ cost_append(AppendPath *apath, PlannerInfo *root) * first few subplans that immediately get a worker assigned. */ if (i == 0) - apath->path.startup_cost = subpath->startup_cost; - else if (i < apath->path.parallel_workers) - apath->path.startup_cost = Min(apath->path.startup_cost, - subpath->startup_cost); + path->path.startup_cost = subpath->startup_cost; + else if (i < path->path.parallel_workers) + path->path.startup_cost = Min(path->path.startup_cost, + subpath->startup_cost); /* * Apply parallel divisor to subpaths. Scale the number of rows @@ -2633,36 +2633,36 @@ cost_append(AppendPath *apath, PlannerInfo *root) * Also add the cost of partial paths to the total cost, but * ignore non-partial paths for now. */ - if (i < apath->first_partial_path) - apath->path.rows += subpath->rows / parallel_divisor; + if (i < path->first_partial_path) + path->path.rows += subpath->rows / parallel_divisor; else { double subpath_parallel_divisor; subpath_parallel_divisor = get_parallel_divisor(subpath); - apath->path.rows += subpath->rows * (subpath_parallel_divisor / - parallel_divisor); - apath->path.total_cost += subpath->total_cost; + path->path.rows += subpath->rows * (subpath_parallel_divisor / + parallel_divisor); + path->path.total_cost += subpath->total_cost; } - apath->path.rows = clamp_row_est(apath->path.rows); + path->path.rows = clamp_row_est(path->path.rows); i++; } /* Add cost for non-partial subpaths. */ - apath->path.total_cost += - append_nonpartial_cost(apath->subpaths, - apath->first_partial_path, - apath->path.parallel_workers); + path->path.total_cost += + append_nonpartial_cost(path->subpaths, + path->first_partial_path, + path->path.parallel_workers); } /* * Although Append does not do any selection or projection, it's not free; * add a small per-tuple overhead. */ - apath->path.total_cost += - cpu_tuple_cost * APPEND_CPU_COST_MULTIPLIER * apath->path.rows; + path->path.total_cost += + cpu_tuple_cost * APPEND_CPU_COST_MULTIPLIER * path->path.rows; } /* diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index cd8a3ef7c..ab4d8e201 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -311,7 +311,7 @@ static ModifyTable *make_modifytable(PlannerInfo *root, Plan *subplan, List *updateColnosLists, List *withCheckOptionLists, List *returningLists, List *rowMarks, OnConflictExpr *onconflict, - List *mergeActionList, int epqParam); + List *mergeActionLists, int epqParam); static GatherMerge *create_gather_merge_plan(PlannerInfo *root, GatherMergePath *best_path); diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 079bd0bfd..27accc389 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -3085,13 +3085,13 @@ extract_rollup_sets(List *groupingSets) * gets implemented in one pass.) */ static List * -reorder_grouping_sets(List *groupingsets, List *sortclause) +reorder_grouping_sets(List *groupingSets, List *sortclause) { ListCell *lc; List *previous = NIL; List *result = NIL; - foreach(lc, groupingsets) + foreach(lc, groupingSets) { List *candidate = (List *) lfirst(lc); List *new_elems = list_difference_int(candidate, previous); diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 5012bfe14..6d5718ee4 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -75,7 +75,8 @@ static List *build_index_tlist(PlannerInfo *root, IndexOptInfo *index, static List *get_relation_statistics(RelOptInfo *rel, Relation relation); static void set_relation_partition_info(PlannerInfo *root, RelOptInfo *rel, Relation relation); -static PartitionScheme find_partition_scheme(PlannerInfo *root, Relation rel); +static PartitionScheme find_partition_scheme(PlannerInfo *root, + Relation relation); static void set_baserel_partition_key_exprs(Relation relation, RelOptInfo *rel); static void set_baserel_partition_constraint(Relation relation, diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 82f03fc9c..9920b56a8 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -205,8 +205,7 @@ static Node *makeXmlExpr(XmlExprOp op, char *name, List *named_args, static List *mergeTableFuncParameters(List *func_args, List *columns); static TypeName *TableFuncTypeName(List *columns); static RangeVar *makeRangeVarFromAnyName(List *names, int position, core_yyscan_t yyscanner); -static RangeVar *makeRangeVarFromQualifiedName(char *name, List *rels, - int location, +static RangeVar *makeRangeVarFromQualifiedName(char *name, List *namelist, int location, core_yyscan_t yyscanner); static void SplitColQualList(List *qualList, List **constraintList, CollateClause **collClause, diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 061d0bcc5..202a38f81 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -67,7 +67,7 @@ static ParseNamespaceItem *transformRangeSubselect(ParseState *pstate, static ParseNamespaceItem *transformRangeFunction(ParseState *pstate, RangeFunction *r); static ParseNamespaceItem *transformRangeTableFunc(ParseState *pstate, - RangeTableFunc *t); + RangeTableFunc *rtf); static TableSampleClause *transformRangeTableSample(ParseState *pstate, RangeTableSample *rts); static ParseNamespaceItem *getNSItemForSpecialRelationTypes(ParseState *pstate, diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index 6d283006e..bd068bba0 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -139,7 +139,7 @@ static void transformPartitionCmd(CreateStmtContext *cxt, PartitionCmd *cmd); static List *transformPartitionRangeBounds(ParseState *pstate, List *blist, Relation parent); static void validateInfiniteBounds(ParseState *pstate, List *blist); -static Const *transformPartitionBoundValue(ParseState *pstate, Node *con, +static Const *transformPartitionBoundValue(ParseState *pstate, Node *val, const char *colName, Oid colType, int32 colTypmod, Oid partCollation); diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c index 57c9b5181..7f74ed212 100644 --- a/src/backend/partitioning/partbounds.c +++ b/src/backend/partitioning/partbounds.c @@ -104,7 +104,7 @@ static PartitionBoundInfo create_list_bounds(PartitionBoundSpec **boundspecs, static PartitionBoundInfo create_range_bounds(PartitionBoundSpec **boundspecs, int nparts, PartitionKey key, int **mapping); static PartitionBoundInfo merge_list_bounds(FmgrInfo *partsupfunc, - Oid *collations, + Oid *partcollation, RelOptInfo *outer_rel, RelOptInfo *inner_rel, JoinType jointype, @@ -123,8 +123,8 @@ static void free_partition_map(PartitionMap *map); static bool is_dummy_partition(RelOptInfo *rel, int part_index); static int merge_matching_partitions(PartitionMap *outer_map, PartitionMap *inner_map, - int outer_part, - int inner_part, + int outer_index, + int inner_index, int *next_index); static int process_outer_partition(PartitionMap *outer_map, PartitionMap *inner_map, diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index de1184ad7..383bc4776 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -414,7 +414,7 @@ static void report_fork_failure_to_client(Port *port, int errnum); static CAC_state canAcceptConnections(int backend_type); static bool RandomCancelKey(int32 *cancel_key); static void signal_child(pid_t pid, int signal); -static bool SignalSomeChildren(int signal, int targets); +static bool SignalSomeChildren(int signal, int target); static void TerminateChildren(int signal); #define SignalChildren(sig) SignalSomeChildren(sig, BACKEND_TYPE_ALL) @@ -2598,9 +2598,9 @@ ConnCreate(int serverFd) * to do here. */ static void -ConnFree(Port *conn) +ConnFree(Port *port) { - free(conn); + free(port); } diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c index 1667d720b..ba2a872ac 100644 --- a/src/backend/replication/logical/decode.c +++ b/src/backend/replication/logical/decode.c @@ -62,13 +62,13 @@ static void DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf, /* common function to decode tuples */ -static void DecodeXLogTuple(char *data, Size len, ReorderBufferTupleBuf *tup); +static void DecodeXLogTuple(char *data, Size len, ReorderBufferTupleBuf *tuple); /* helper functions for decoding transactions */ static inline bool FilterPrepare(LogicalDecodingContext *ctx, TransactionId xid, const char *gid); static bool DecodeTXNNeedSkip(LogicalDecodingContext *ctx, - XLogRecordBuffer *buf, Oid dbId, + XLogRecordBuffer *buf, Oid txn_dbid, RepOriginId origin_id); /* diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index eaca406d3..3396bfbba 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -312,7 +312,7 @@ static inline void cleanup_subxact_info(void); * Serialize and deserialize changes for a toplevel transaction. */ static void stream_cleanup_files(Oid subid, TransactionId xid); -static void stream_open_file(Oid subid, TransactionId xid, bool first); +static void stream_open_file(Oid subid, TransactionId xid, bool first_segment); static void stream_write_change(char action, StringInfo s); static void stream_close_file(void); diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c index 62e0ffecd..03b13ae67 100644 --- a/src/backend/replication/pgoutput/pgoutput.c +++ b/src/backend/replication/pgoutput/pgoutput.c @@ -44,7 +44,7 @@ static void pgoutput_begin_txn(LogicalDecodingContext *ctx, static void pgoutput_commit_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, XLogRecPtr commit_lsn); static void pgoutput_change(LogicalDecodingContext *ctx, - ReorderBufferTXN *txn, Relation rel, + ReorderBufferTXN *txn, Relation relation, ReorderBufferChange *change); static void pgoutput_truncate(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, int nrelations, Relation relations[], @@ -212,7 +212,7 @@ typedef struct PGOutputTxnData /* Map used to remember which relation schemas we sent. */ static HTAB *RelationSyncCache = NULL; -static void init_rel_sync_cache(MemoryContext decoding_context); +static void init_rel_sync_cache(MemoryContext cachectx); static void cleanup_rel_sync_cache(TransactionId xid, bool is_commit); static RelationSyncEntry *get_rel_sync_entry(PGOutputData *data, Relation relation); diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c index 8fec1cb4a..0bd003118 100644 --- a/src/backend/replication/slot.c +++ b/src/backend/replication/slot.c @@ -108,7 +108,7 @@ static void ReplicationSlotDropPtr(ReplicationSlot *slot); /* internal persistency functions */ static void RestoreSlotFromDisk(const char *name); static void CreateSlotOnDisk(ReplicationSlot *slot); -static void SaveSlotToPath(ReplicationSlot *slot, const char *path, int elevel); +static void SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel); /* * Report shared-memory space needed by ReplicationSlotsShmemInit. diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index ee05e230e..ab97e71dd 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -83,7 +83,7 @@ static void statext_store(Oid statOid, bool inh, MVNDistinct *ndistinct, MVDependencies *dependencies, MCVList *mcv, Datum exprs, VacAttrStats **stats); static int statext_compute_stattarget(int stattarget, - int natts, VacAttrStats **stats); + int nattrs, VacAttrStats **stats); /* Information needed to analyze a single simple expression. */ typedef struct AnlExprData @@ -99,7 +99,7 @@ static Datum serialize_expr_stats(AnlExprData *exprdata, int nexprs); static Datum expr_fetch_func(VacAttrStatsP stats, int rownum, bool *isNull); static AnlExprData *build_expr_data(List *exprs, int stattarget); -static StatsBuildData *make_build_data(Relation onerel, StatExtEntry *stat, +static StatsBuildData *make_build_data(Relation rel, StatExtEntry *stat, int numrows, HeapTuple *rows, VacAttrStats **stats, int stattarget); diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index e898ffad7..5b0e531f9 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -459,7 +459,7 @@ ForgetPrivateRefCountEntry(PrivateRefCountEntry *ref) ) -static Buffer ReadBuffer_common(SMgrRelation reln, char relpersistence, +static Buffer ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum, BlockNumber blockNum, ReadBufferMode mode, BufferAccessStrategy strategy, bool *hit); @@ -493,7 +493,7 @@ static void RelationCopyStorageUsingBuffer(RelFileLocator srclocator, static void AtProcExit_Buffers(int code, Datum arg); static void CheckForBufferLeaks(void); static int rlocator_comparator(const void *p1, const void *p2); -static inline int buffertag_comparator(const BufferTag *a, const BufferTag *b); +static inline int buffertag_comparator(const BufferTag *ba, const BufferTag *bb); static inline int ckpt_buforder_comparator(const CkptSortItem *a, const CkptSortItem *b); static int ts_ckpt_progress_comparator(Datum a, Datum b, void *arg); diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index 56b88594c..b0b4eeb3b 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -104,7 +104,7 @@ static void extendBufFile(BufFile *file); static void BufFileLoadBuffer(BufFile *file); static void BufFileDumpBuffer(BufFile *file); static void BufFileFlush(BufFile *file); -static File MakeNewFileSetSegment(BufFile *file, int segment); +static File MakeNewFileSetSegment(BufFile *buffile, int segment); /* * Create BufFile and perform the common initialization. diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 005def56d..a6b053310 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -111,7 +111,7 @@ static int fsm_set_and_search(Relation rel, FSMAddress addr, uint16 slot, static BlockNumber fsm_search(Relation rel, uint8 min_cat); static uint8 fsm_vacuum_page(Relation rel, FSMAddress addr, BlockNumber start, BlockNumber end, - bool *eof); + bool *eof_p); /******** Public API ********/ diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c index 9d86bbe87..a360325f8 100644 --- a/src/backend/storage/ipc/dsm.c +++ b/src/backend/storage/ipc/dsm.c @@ -1045,7 +1045,7 @@ dsm_unpin_segment(dsm_handle handle) * Find an existing mapping for a shared memory segment, if there is one. */ dsm_segment * -dsm_find_mapping(dsm_handle h) +dsm_find_mapping(dsm_handle handle) { dlist_iter iter; dsm_segment *seg; @@ -1053,7 +1053,7 @@ dsm_find_mapping(dsm_handle h) dlist_foreach(iter, &dsm_segment_list) { seg = dlist_container(dsm_segment, node, iter.cur); - if (seg->handle == h) + if (seg->handle == handle) return seg; } diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 0555b02a8..382f4cfb7 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -343,7 +343,7 @@ static bool KnownAssignedXidExists(TransactionId xid); static void KnownAssignedXidsRemove(TransactionId xid); static void KnownAssignedXidsRemoveTree(TransactionId xid, int nsubxids, TransactionId *subxids); -static void KnownAssignedXidsRemovePreceding(TransactionId xid); +static void KnownAssignedXidsRemovePreceding(TransactionId removeXid); static int KnownAssignedXidsGet(TransactionId *xarray, TransactionId xmax); static int KnownAssignedXidsGetAndSetXmin(TransactionId *xarray, TransactionId *xmin, diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index 38317edaf..d274c9b1d 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -1913,13 +1913,13 @@ LWLockReleaseAll(void) * This is meant as debug support only. */ bool -LWLockHeldByMe(LWLock *l) +LWLockHeldByMe(LWLock *lock) { int i; for (i = 0; i < num_held_lwlocks; i++) { - if (held_lwlocks[i].lock == l) + if (held_lwlocks[i].lock == lock) return true; } return false; @@ -1931,14 +1931,14 @@ LWLockHeldByMe(LWLock *l) * This is meant as debug support only. */ bool -LWLockAnyHeldByMe(LWLock *l, int nlocks, size_t stride) +LWLockAnyHeldByMe(LWLock *lock, int nlocks, size_t stride) { char *held_lock_addr; char *begin; char *end; int i; - begin = (char *) l; + begin = (char *) lock; end = begin + nlocks * stride; for (i = 0; i < num_held_lwlocks; i++) { @@ -1957,13 +1957,13 @@ LWLockAnyHeldByMe(LWLock *l, int nlocks, size_t stride) * This is meant as debug support only. */ bool -LWLockHeldByMeInMode(LWLock *l, LWLockMode mode) +LWLockHeldByMeInMode(LWLock *lock, LWLockMode mode) { int i; for (i = 0; i < num_held_lwlocks; i++) { - if (held_lwlocks[i].lock == l && held_lwlocks[i].mode == mode) + if (held_lwlocks[i].lock == lock && held_lwlocks[i].mode == mode) return true; } return false; diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index 562ac5b43..5f2a4805d 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -446,7 +446,7 @@ static void SerialSetActiveSerXmin(TransactionId xid); static uint32 predicatelock_hash(const void *key, Size keysize); static void SummarizeOldestCommittedSxact(void); -static Snapshot GetSafeSnapshot(Snapshot snapshot); +static Snapshot GetSafeSnapshot(Snapshot origSnapshot); static Snapshot GetSerializableTransactionSnapshotInt(Snapshot snapshot, VirtualTransactionId *sourcevxid, int sourcepid); diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 3deac496e..a515bb36a 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -121,7 +121,7 @@ static MemoryContext MdCxt; /* context for all MdfdVec objects */ /* local routines */ -static void mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forkNum, +static void mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo); static MdfdVec *mdopenfork(SMgrRelation reln, ForkNumber forknum, int behavior); static void register_dirty_segment(SMgrRelation reln, ForkNumber forknum, @@ -135,9 +135,9 @@ static void _fdvec_resize(SMgrRelation reln, int nseg); static char *_mdfd_segpath(SMgrRelation reln, ForkNumber forknum, BlockNumber segno); -static MdfdVec *_mdfd_openseg(SMgrRelation reln, ForkNumber forkno, +static MdfdVec *_mdfd_openseg(SMgrRelation reln, ForkNumber forknum, BlockNumber segno, int oflags); -static MdfdVec *_mdfd_getseg(SMgrRelation reln, ForkNumber forkno, +static MdfdVec *_mdfd_getseg(SMgrRelation reln, ForkNumber forknum, BlockNumber blkno, bool skipFsync, int behavior); static BlockNumber _mdnblocks(SMgrRelation reln, ForkNumber forknum, MdfdVec *seg); @@ -160,7 +160,7 @@ mdinit(void) * Note: this will return true for lingering files, with pending deletions */ bool -mdexists(SMgrRelation reln, ForkNumber forkNum) +mdexists(SMgrRelation reln, ForkNumber forknum) { /* * Close it first, to ensure that we notice if the fork has been unlinked @@ -168,9 +168,9 @@ mdexists(SMgrRelation reln, ForkNumber forkNum) * which already closes relations when dropping them. */ if (!InRecovery) - mdclose(reln, forkNum); + mdclose(reln, forknum); - return (mdopenfork(reln, forkNum, EXTENSION_RETURN_NULL) != NULL); + return (mdopenfork(reln, forknum, EXTENSION_RETURN_NULL) != NULL); } /* @@ -179,16 +179,16 @@ mdexists(SMgrRelation reln, ForkNumber forkNum) * If isRedo is true, it's okay for the relation to exist already. */ void -mdcreate(SMgrRelation reln, ForkNumber forkNum, bool isRedo) +mdcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo) { MdfdVec *mdfd; char *path; File fd; - if (isRedo && reln->md_num_open_segs[forkNum] > 0) + if (isRedo && reln->md_num_open_segs[forknum] > 0) return; /* created and opened already... */ - Assert(reln->md_num_open_segs[forkNum] == 0); + Assert(reln->md_num_open_segs[forknum] == 0); /* * We may be using the target table space for the first time in this @@ -203,7 +203,7 @@ mdcreate(SMgrRelation reln, ForkNumber forkNum, bool isRedo) reln->smgr_rlocator.locator.dbOid, isRedo); - path = relpath(reln->smgr_rlocator, forkNum); + path = relpath(reln->smgr_rlocator, forknum); fd = PathNameOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY); @@ -225,8 +225,8 @@ mdcreate(SMgrRelation reln, ForkNumber forkNum, bool isRedo) pfree(path); - _fdvec_resize(reln, forkNum, 1); - mdfd = &reln->md_seg_fds[forkNum][0]; + _fdvec_resize(reln, forknum, 1); + mdfd = &reln->md_seg_fds[forknum][0]; mdfd->mdfd_vfd = fd; mdfd->mdfd_segno = 0; } @@ -237,7 +237,7 @@ mdcreate(SMgrRelation reln, ForkNumber forkNum, bool isRedo) * Note that we're passed a RelFileLocatorBackend --- by the time this is called, * there won't be an SMgrRelation hashtable entry anymore. * - * forkNum can be a fork number to delete a specific fork, or InvalidForkNumber + * forknum can be a fork number to delete a specific fork, or InvalidForkNumber * to delete all forks. * * For regular relations, we don't unlink the first segment file of the rel, @@ -278,16 +278,16 @@ mdcreate(SMgrRelation reln, ForkNumber forkNum, bool isRedo) * we are usually not in a transaction anymore when this is called. */ void -mdunlink(RelFileLocatorBackend rlocator, ForkNumber forkNum, bool isRedo) +mdunlink(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo) { /* Now do the per-fork work */ - if (forkNum == InvalidForkNumber) + if (forknum == InvalidForkNumber) { - for (forkNum = 0; forkNum <= MAX_FORKNUM; forkNum++) - mdunlinkfork(rlocator, forkNum, isRedo); + for (forknum = 0; forknum <= MAX_FORKNUM; forknum++) + mdunlinkfork(rlocator, forknum, isRedo); } else - mdunlinkfork(rlocator, forkNum, isRedo); + mdunlinkfork(rlocator, forknum, isRedo); } /* @@ -315,18 +315,18 @@ do_truncate(const char *path) } static void -mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forkNum, bool isRedo) +mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forknum, bool isRedo) { char *path; int ret; BlockNumber segno = 0; - path = relpath(rlocator, forkNum); + path = relpath(rlocator, forknum); /* * Delete or truncate the first segment. */ - if (isRedo || forkNum != MAIN_FORKNUM || RelFileLocatorBackendIsTemp(rlocator)) + if (isRedo || forknum != MAIN_FORKNUM || RelFileLocatorBackendIsTemp(rlocator)) { if (!RelFileLocatorBackendIsTemp(rlocator)) { @@ -334,7 +334,7 @@ mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forkNum, bool isRedo) ret = do_truncate(path); /* Forget any pending sync requests for the first segment */ - register_forget_request(rlocator, forkNum, 0 /* first seg */ ); + register_forget_request(rlocator, forknum, 0 /* first seg */ ); } else ret = 0; @@ -367,7 +367,7 @@ mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forkNum, bool isRedo) */ if (!IsBinaryUpgrade) { - register_unlink_segment(rlocator, forkNum, 0 /* first seg */ ); + register_unlink_segment(rlocator, forknum, 0 /* first seg */ ); ++segno; } } @@ -403,7 +403,7 @@ mdunlinkfork(RelFileLocatorBackend rlocator, ForkNumber forkNum, bool isRedo) * Forget any pending sync requests for this segment before we * try to unlink. */ - register_forget_request(rlocator, forkNum, segno); + register_forget_request(rlocator, forknum, segno); } if (unlink(segpath) < 0) diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 43fff50d4..350039cc8 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -32,7 +32,7 @@ #include "utils/memutils.h" #include "utils/tzparser.h" -static int DecodeNumber(int flen, char *field, bool haveTextMonth, +static int DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask, int *tmask, struct pg_tm *tm, fsec_t *fsec, bool *is2digits); static int DecodeNumberField(int len, char *str, @@ -281,26 +281,26 @@ static const datetkn *abbrevcache[MAXDATEFIELDS] = {NULL}; */ int -date2j(int y, int m, int d) +date2j(int year, int month, int day) { int julian; int century; - if (m > 2) + if (month > 2) { - m += 1; - y += 4800; + month += 1; + year += 4800; } else { - m += 13; - y += 4799; + month += 13; + year += 4799; } - century = y / 100; - julian = y * 365 - 32167; - julian += y / 4 - century + century / 4; - julian += 7834 * m / 256 + d; + century = year / 100; + julian = year * 365 - 32167; + julian += year / 4 - century + century / 4; + julian += 7834 * month / 256 + day; return julian; } /* date2j() */ diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index f1b632ef3..d78002b90 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -90,7 +90,7 @@ static inline float8 line_sl(LINE *line); static inline float8 line_invsl(LINE *line); static bool line_interpt_line(Point *result, LINE *l1, LINE *l2); static bool line_contain_point(LINE *line, Point *point); -static float8 line_closept_point(Point *result, LINE *line, Point *pt); +static float8 line_closept_point(Point *result, LINE *line, Point *point); /* Routines for line segments */ static inline void statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2); @@ -98,8 +98,8 @@ static inline float8 lseg_sl(LSEG *lseg); static inline float8 lseg_invsl(LSEG *lseg); static bool lseg_interpt_line(Point *result, LSEG *lseg, LINE *line); static bool lseg_interpt_lseg(Point *result, LSEG *l1, LSEG *l2); -static int lseg_crossing(float8 x, float8 y, float8 px, float8 py); -static bool lseg_contain_point(LSEG *lseg, Point *point); +static int lseg_crossing(float8 x, float8 y, float8 prev_x, float8 prev_y); +static bool lseg_contain_point(LSEG *lseg, Point *pt); static float8 lseg_closept_point(Point *result, LSEG *lseg, Point *pt); static float8 lseg_closept_line(Point *result, LSEG *lseg, LINE *line); static float8 lseg_closept_lseg(Point *result, LSEG *on_lseg, LSEG *to_lseg); @@ -115,7 +115,7 @@ static bool box_contain_point(BOX *box, Point *point); static bool box_contain_box(BOX *contains_box, BOX *contained_box); static bool box_contain_lseg(BOX *box, LSEG *lseg); static bool box_interpt_lseg(Point *result, BOX *box, LSEG *lseg); -static float8 box_closept_point(Point *result, BOX *box, Point *point); +static float8 box_closept_point(Point *result, BOX *box, Point *pt); static float8 box_closept_lseg(Point *result, BOX *box, LSEG *lseg); /* Routines for circles */ diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index e02fc3725..8e671b9fa 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -33,11 +33,11 @@ static int SB_MatchText(const char *t, int tlen, const char *p, int plen, pg_locale_t locale, bool locale_is_c); -static text *SB_do_like_escape(text *, text *); +static text *SB_do_like_escape(text *pat, text *esc); static int MB_MatchText(const char *t, int tlen, const char *p, int plen, pg_locale_t locale, bool locale_is_c); -static text *MB_do_like_escape(text *, text *); +static text *MB_do_like_escape(text *pat, text *esc); static int UTF8_MatchText(const char *t, int tlen, const char *p, int plen, pg_locale_t locale, bool locale_is_c); diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 920a63b00..85ee9ec42 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -499,7 +499,7 @@ static void zero_var(NumericVar *var); static const char *set_var_from_str(const char *str, const char *cp, NumericVar *dest); -static void set_var_from_num(Numeric value, NumericVar *dest); +static void set_var_from_num(Numeric num, NumericVar *dest); static void init_var_from_num(Numeric num, NumericVar *dest); static void set_var_from_var(const NumericVar *value, NumericVar *dest); static char *get_str_from_var(const NumericVar *var); @@ -510,7 +510,7 @@ static void numericvar_deserialize(StringInfo buf, NumericVar *var); static Numeric duplicate_numeric(Numeric num); static Numeric make_result(const NumericVar *var); -static Numeric make_result_opt_error(const NumericVar *var, bool *error); +static Numeric make_result_opt_error(const NumericVar *var, bool *have_error); static void apply_typmod(NumericVar *var, int32 typmod); static void apply_typmod_special(Numeric num, int32 typmod); @@ -591,7 +591,7 @@ static void compute_bucket(Numeric operand, Numeric bound1, Numeric bound2, const NumericVar *count_var, bool reversed_bounds, NumericVar *result_var); -static void accum_sum_add(NumericSumAccum *accum, const NumericVar *var1); +static void accum_sum_add(NumericSumAccum *accum, const NumericVar *val); static void accum_sum_rescale(NumericSumAccum *accum, const NumericVar *val); static void accum_sum_carry(NumericSumAccum *accum); static void accum_sum_reset(NumericSumAccum *accum); diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c index aa4c53e0a..b09cb4905 100644 --- a/src/backend/utils/adt/rangetypes.c +++ b/src/backend/utils/adt/rangetypes.c @@ -55,14 +55,14 @@ typedef struct RangeIOData static RangeIOData *get_range_io_data(FunctionCallInfo fcinfo, Oid rngtypid, IOFuncSelector func); static char range_parse_flags(const char *flags_str); -static void range_parse(const char *input_str, char *flags, char **lbound_str, +static void range_parse(const char *string, char *flags, char **lbound_str, char **ubound_str); static const char *range_parse_bound(const char *string, const char *ptr, char **bound_str, bool *infinite); static char *range_deparse(char flags, const char *lbound_str, const char *ubound_str); static char *range_bound_escape(const char *value); -static Size datum_compute_size(Size sz, Datum datum, bool typbyval, +static Size datum_compute_size(Size data_length, Datum val, bool typbyval, char typalign, int16 typlen, char typstorage); static Pointer datum_write(Pointer ptr, Datum datum, bool typbyval, char typalign, int16 typlen, char typstorage); diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 51b3fdc9a..1d503e7e0 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -196,7 +196,7 @@ static void ri_GenerateQual(StringInfo buf, Oid opoid, const char *rightop, Oid rightoptype); static void ri_GenerateQualCollation(StringInfo buf, Oid collation); -static int ri_NullCheck(TupleDesc tupdesc, TupleTableSlot *slot, +static int ri_NullCheck(TupleDesc tupDesc, TupleTableSlot *slot, const RI_ConstraintInfo *riinfo, bool rel_is_pk); static void ri_BuildQueryKey(RI_QueryKey *key, const RI_ConstraintInfo *riinfo, diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 021b760f4..9799647e1 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -2034,9 +2034,9 @@ time2t(const int hour, const int min, const int sec, const fsec_t fsec) } static Timestamp -dt2local(Timestamp dt, int tz) +dt2local(Timestamp dt, int timezone) { - dt -= (tz * USECS_PER_SEC); + dt -= (timezone * USECS_PER_SEC); return dt; } diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 606088cdf..d32cb1143 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -121,7 +121,7 @@ static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID, xmlParserCtxtPtr ctxt); static void xml_errorHandler(void *data, xmlErrorPtr error); static void xml_ereport_by_code(int level, int sqlcode, - const char *msg, int errcode); + const char *msg, int code); static void chopStringInfoNewlines(StringInfo str); static void appendStringInfoLineSeparator(StringInfo str); diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c index e7345e141..626656860 100644 --- a/src/backend/utils/cache/relmapper.c +++ b/src/backend/utils/cache/relmapper.c @@ -137,7 +137,7 @@ static RelMapFile pending_local_updates; /* non-export function prototypes */ static void apply_map_update(RelMapFile *map, Oid relationId, - RelFileNumber filenumber, bool add_okay); + RelFileNumber fileNumber, bool add_okay); static void merge_map_updates(RelMapFile *map, const RelMapFile *updates, bool add_okay); static void load_relmap_file(bool shared, bool lock_held); diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 96c694da8..eb724a9d7 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -179,7 +179,7 @@ static const char *err_gettext(const char *str) pg_attribute_format_arg(1); static pg_noinline void set_backtrace(ErrorData *edata, int num_skip); static void set_errdata_field(MemoryContextData *cxt, char **ptr, const char *str); static void write_console(const char *line, int len); -static const char *process_log_prefix_padding(const char *p, int *padding); +static const char *process_log_prefix_padding(const char *p, int *ppadding); static void log_line_prefix(StringInfo buf, ErrorData *edata); static void send_message_to_server_log(ErrorData *edata); static void send_message_to_frontend(ErrorData *edata); diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c index 93493d415..25791e23e 100644 --- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c +++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c @@ -54,8 +54,8 @@ static int sjis2mic(const unsigned char *sjis, unsigned char *p, int len, bool n static int mic2sjis(const unsigned char *mic, unsigned char *p, int len, bool noError); static int euc_jp2mic(const unsigned char *euc, unsigned char *p, int len, bool noError); static int mic2euc_jp(const unsigned char *mic, unsigned char *p, int len, bool noError); -static int euc_jp2sjis(const unsigned char *mic, unsigned char *p, int len, bool noError); -static int sjis2euc_jp(const unsigned char *mic, unsigned char *p, int len, bool noError); +static int euc_jp2sjis(const unsigned char *euc, unsigned char *p, int len, bool noError); +static int sjis2euc_jp(const unsigned char *sjis, unsigned char *p, int len, bool noError); Datum euc_jp_to_sjis(PG_FUNCTION_ARGS) diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c index e00a2ca41..88e0deb5e 100644 --- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c +++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c @@ -41,7 +41,7 @@ PG_FUNCTION_INFO_V1(mic_to_big5); */ static int euc_tw2big5(const unsigned char *euc, unsigned char *p, int len, bool noError); -static int big52euc_tw(const unsigned char *euc, unsigned char *p, int len, bool noError); +static int big52euc_tw(const unsigned char *big5, unsigned char *p, int len, bool noError); static int big52mic(const unsigned char *big5, unsigned char *p, int len, bool noError); static int mic2big5(const unsigned char *mic, unsigned char *p, int len, bool noError); static int euc_tw2mic(const unsigned char *euc, unsigned char *p, int len, bool noError); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index b11d609bb..8c2e08fad 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -225,7 +225,7 @@ static void reapply_stacked_values(struct config_generic *variable, Oid cursrole); static bool validate_option_array_item(const char *name, const char *value, bool skipIfNoPermissions); -static void write_auto_conf_file(int fd, const char *filename, ConfigVariable *head_p); +static void write_auto_conf_file(int fd, const char *filename, ConfigVariable *head); static void replace_auto_config_value(ConfigVariable **head_p, ConfigVariable **tail_p, const char *name, const char *value); static bool valid_custom_variable_name(const char *name); diff --git a/src/backend/utils/misc/queryjumble.c b/src/backend/utils/misc/queryjumble.c index a67487e5f..6e75acda2 100644 --- a/src/backend/utils/misc/queryjumble.c +++ b/src/backend/utils/misc/queryjumble.c @@ -45,7 +45,8 @@ int compute_query_id = COMPUTE_QUERY_ID_AUTO; /* True when compute_query_id is ON, or AUTO and a module requests them */ bool query_id_enabled = false; -static uint64 compute_utility_query_id(const char *str, int query_location, int query_len); +static uint64 compute_utility_query_id(const char *query_text, + int query_location, int query_len); static void AppendJumble(JumbleState *jstate, const unsigned char *item, Size size); static void JumbleQueryInternal(JumbleState *jstate, Query *query); diff --git a/src/backend/utils/sort/tuplesortvariants.c b/src/backend/utils/sort/tuplesortvariants.c index 7ad4429ad..afa5bdbf0 100644 --- a/src/backend/utils/sort/tuplesortvariants.c +++ b/src/backend/utils/sort/tuplesortvariants.c @@ -56,7 +56,7 @@ static int comparetup_cluster(const SortTuple *a, const SortTuple *b, static void writetup_cluster(Tuplesortstate *state, LogicalTape *tape, SortTuple *stup); static void readtup_cluster(Tuplesortstate *state, SortTuple *stup, - LogicalTape *tape, unsigned int len); + LogicalTape *tape, unsigned int tuplen); static int comparetup_index_btree(const SortTuple *a, const SortTuple *b, Tuplesortstate *state); static int comparetup_index_hash(const SortTuple *a, const SortTuple *b, diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index 9b504c974..f1f2ddac1 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -680,9 +680,9 @@ FreeSnapshot(Snapshot snapshot) * with active refcount=1. Otherwise, only increment the refcount. */ void -PushActiveSnapshot(Snapshot snap) +PushActiveSnapshot(Snapshot snapshot) { - PushActiveSnapshotWithLevel(snap, GetCurrentTransactionNestLevel()); + PushActiveSnapshotWithLevel(snapshot, GetCurrentTransactionNestLevel()); } /* @@ -694,11 +694,11 @@ PushActiveSnapshot(Snapshot snap) * must not be deeper than the current top of the snapshot stack. */ void -PushActiveSnapshotWithLevel(Snapshot snap, int snap_level) +PushActiveSnapshotWithLevel(Snapshot snapshot, int snap_level) { ActiveSnapshotElt *newactive; - Assert(snap != InvalidSnapshot); + Assert(snapshot != InvalidSnapshot); Assert(ActiveSnapshot == NULL || snap_level >= ActiveSnapshot->as_level); newactive = MemoryContextAlloc(TopTransactionContext, sizeof(ActiveSnapshotElt)); @@ -707,10 +707,11 @@ PushActiveSnapshotWithLevel(Snapshot snap, int snap_level) * Checking SecondarySnapshot is probably useless here, but it seems * better to be sure. */ - if (snap == CurrentSnapshot || snap == SecondarySnapshot || !snap->copied) - newactive->as_snap = CopySnapshot(snap); + if (snapshot == CurrentSnapshot || snapshot == SecondarySnapshot || + !snapshot->copied) + newactive->as_snap = CopySnapshot(snapshot); else - newactive->as_snap = snap; + newactive->as_snap = snapshot; newactive->as_next = ActiveSnapshot; newactive->as_level = snap_level; @@ -2119,20 +2120,20 @@ HistoricSnapshotGetTupleCids(void) * SerializedSnapshotData. */ Size -EstimateSnapshotSpace(Snapshot snap) +EstimateSnapshotSpace(Snapshot snapshot) { Size size; - Assert(snap != InvalidSnapshot); - Assert(snap->snapshot_type == SNAPSHOT_MVCC); + Assert(snapshot != InvalidSnapshot); + Assert(snapshot->snapshot_type == SNAPSHOT_MVCC); /* We allocate any XID arrays needed in the same palloc block. */ size = add_size(sizeof(SerializedSnapshotData), - mul_size(snap->xcnt, sizeof(TransactionId))); - if (snap->subxcnt > 0 && - (!snap->suboverflowed || snap->takenDuringRecovery)) + mul_size(snapshot->xcnt, sizeof(TransactionId))); + if (snapshot->subxcnt > 0 && + (!snapshot->suboverflowed || snapshot->takenDuringRecovery)) size = add_size(size, - mul_size(snap->subxcnt, sizeof(TransactionId))); + mul_size(snapshot->subxcnt, sizeof(TransactionId))); return size; } diff --git a/src/fe_utils/cancel.c b/src/fe_utils/cancel.c index 8d9ea19de..32195cb70 100644 --- a/src/fe_utils/cancel.c +++ b/src/fe_utils/cancel.c @@ -183,9 +183,9 @@ handle_sigint(SIGNAL_ARGS) * Register query cancellation callback for SIGINT. */ void -setup_cancel_handler(void (*callback) (void)) +setup_cancel_handler(void (*query_cancel_callback) (void)) { - cancel_callback = callback; + cancel_callback = query_cancel_callback; cancel_sent_msg = _("Cancel request sent\n"); cancel_not_sent_msg = _("Could not send cancel request: "); diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 28f22b25b..f61a04305 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -275,7 +275,7 @@ static char *escape_quotes_bki(const char *src); static int locale_date_order(const char *locale); static void check_locale_name(int category, const char *locale, char **canonname); -static bool check_locale_encoding(const char *locale, int encoding); +static bool check_locale_encoding(const char *locale, int user_enc); static void setlocales(void); static void usage(const char *progname); void setup_pgdata(void); diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c index fea35e4b1..9ce4b11f1 100644 --- a/src/bin/pg_amcheck/pg_amcheck.c +++ b/src/bin/pg_amcheck/pg_amcheck.c @@ -197,7 +197,7 @@ static void append_btree_pattern(PatternInfoArray *pia, const char *pattern, static void compile_database_list(PGconn *conn, SimplePtrList *databases, const char *initial_dbname); static void compile_relation_list_one_db(PGconn *conn, SimplePtrList *relations, - const DatabaseInfo *datinfo, + const DatabaseInfo *dat, uint64 *pagecount); #define log_no_match(...) do { \ diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c index 5c22c914b..6a0d0758e 100644 --- a/src/bin/pg_basebackup/pg_receivewal.c +++ b/src/bin/pg_basebackup/pg_receivewal.c @@ -63,7 +63,7 @@ static DIR *get_destination_dir(char *dest_folder); static void close_destination_dir(DIR *dest_dir, char *dest_folder); static XLogRecPtr FindStreamingStart(uint32 *tli); static void StreamLog(void); -static bool stop_streaming(XLogRecPtr segendpos, uint32 timeline, +static bool stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished); static void diff --git a/src/bin/pg_basebackup/streamutil.h b/src/bin/pg_basebackup/streamutil.h index 8638f81f3..1537ef47e 100644 --- a/src/bin/pg_basebackup/streamutil.h +++ b/src/bin/pg_basebackup/streamutil.h @@ -44,7 +44,7 @@ extern bool RunIdentifySystem(PGconn *conn, char **sysid, extern void AppendPlainCommandOption(PQExpBuffer buf, bool use_new_option_syntax, - char *option_value); + char *option_name); extern void AppendStringCommandOption(PQExpBuffer buf, bool use_new_option_syntax, char *option_name, char *option_value); diff --git a/src/bin/pg_basebackup/walmethods.h b/src/bin/pg_basebackup/walmethods.h index 76530dc94..06139f2f0 100644 --- a/src/bin/pg_basebackup/walmethods.h +++ b/src/bin/pg_basebackup/walmethods.h @@ -96,11 +96,11 @@ struct WalWriteMethod * not all those required for pg_receivewal) */ WalWriteMethod *CreateWalDirectoryMethod(const char *basedir, - pg_compress_algorithm compression_algo, - int compression, bool sync); + pg_compress_algorithm compression_algorithm, + int compression_level, bool sync); WalWriteMethod *CreateWalTarMethod(const char *tarbase, - pg_compress_algorithm compression_algo, - int compression, bool sync); + pg_compress_algorithm compression_algorithm, + int compression_level, bool sync); /* Cleanup routines for previously-created methods */ void FreeWalDirectoryMethod(void); diff --git a/src/bin/pg_rewind/file_ops.h b/src/bin/pg_rewind/file_ops.h index 54a853bd4..e6277c463 100644 --- a/src/bin/pg_rewind/file_ops.h +++ b/src/bin/pg_rewind/file_ops.h @@ -17,8 +17,8 @@ extern void write_target_range(char *buf, off_t begin, size_t size); extern void close_target_file(void); extern void remove_target_file(const char *path, bool missing_ok); extern void truncate_target_file(const char *path, off_t newsize); -extern void create_target(file_entry_t *t); -extern void remove_target(file_entry_t *t); +extern void create_target(file_entry_t *entry); +extern void remove_target(file_entry_t *entry); extern void sync_target_dir(void); extern char *slurpFile(const char *datadir, const char *path, size_t *filesize); diff --git a/src/bin/pg_rewind/pg_rewind.h b/src/bin/pg_rewind/pg_rewind.h index 8b4b50a33..80c276285 100644 --- a/src/bin/pg_rewind/pg_rewind.h +++ b/src/bin/pg_rewind/pg_rewind.h @@ -37,7 +37,7 @@ extern uint64 fetch_done; extern void extractPageMap(const char *datadir, XLogRecPtr startpoint, int tliIndex, XLogRecPtr endpoint, const char *restoreCommand); -extern void findLastCheckpoint(const char *datadir, XLogRecPtr searchptr, +extern void findLastCheckpoint(const char *datadir, XLogRecPtr forkptr, int tliIndex, XLogRecPtr *lastchkptrec, TimeLineID *lastchkpttli, XLogRecPtr *lastchkptredo, diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c index 53ea348e2..f18cf9712 100644 --- a/src/bin/pg_upgrade/info.c +++ b/src/bin/pg_upgrade/info.c @@ -23,7 +23,7 @@ static void free_db_and_rel_infos(DbInfoArr *db_arr); static void get_db_infos(ClusterInfo *cluster); static void get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo); static void free_rel_infos(RelInfoArr *rel_arr); -static void print_db_infos(DbInfoArr *dbinfo); +static void print_db_infos(DbInfoArr *db_arr); static void print_rel_infos(RelInfoArr *rel_arr); diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h index 60c3c8dd6..e379aa466 100644 --- a/src/bin/pg_upgrade/pg_upgrade.h +++ b/src/bin/pg_upgrade/pg_upgrade.h @@ -358,7 +358,7 @@ void generate_old_dump(void); #define EXEC_PSQL_ARGS "--echo-queries --set ON_ERROR_STOP=on --no-psqlrc --dbname=template1" -bool exec_prog(const char *log_file, const char *opt_log_file, +bool exec_prog(const char *log_filename, const char *opt_log_file, bool report_error, bool exit_on_error, const char *fmt,...) pg_attribute_printf(5, 6); void verify_directories(void); bool pid_lock_file_exists(const char *datadir); diff --git a/src/bin/pg_upgrade/relfilenumber.c b/src/bin/pg_upgrade/relfilenumber.c index c3c7402ef..c3f3d6bc0 100644 --- a/src/bin/pg_upgrade/relfilenumber.c +++ b/src/bin/pg_upgrade/relfilenumber.c @@ -16,7 +16,7 @@ #include "pg_upgrade.h" static void transfer_single_new_db(FileNameMap *maps, int size, char *old_tablespace); -static void transfer_relfile(FileNameMap *map, const char *suffix, bool vm_must_add_frozenbit); +static void transfer_relfile(FileNameMap *map, const char *type_suffix, bool vm_must_add_frozenbit); /* diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c index 63d02719a..2c0d285de 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.c +++ b/src/bin/pg_verifybackup/pg_verifybackup.c @@ -134,7 +134,7 @@ static void verify_backup_file(verifier_context *context, static void report_extra_backup_files(verifier_context *context); static void verify_backup_checksums(verifier_context *context); static void verify_file_checksum(verifier_context *context, - manifest_file *m, char *pathname); + manifest_file *m, char *fullpath); static void parse_required_wal(verifier_context *context, char *pg_waldump_path, char *wal_directory, diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c index 6a3386e97..38e0036e2 100644 --- a/src/bin/pg_waldump/compat.c +++ b/src/bin/pg_waldump/compat.c @@ -46,19 +46,19 @@ timestamptz_to_time_t(TimestampTz t) * moved into src/common. That's a large project though. */ const char * -timestamptz_to_str(TimestampTz dt) +timestamptz_to_str(TimestampTz t) { static char buf[MAXDATELEN + 1]; char ts[MAXDATELEN + 1]; char zone[MAXDATELEN + 1]; - time_t result = (time_t) timestamptz_to_time_t(dt); + time_t result = (time_t) timestamptz_to_time_t(t); struct tm *ltime = localtime(&result); strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", ltime); strftime(zone, sizeof(zone), "%Z", ltime); snprintf(buf, sizeof(buf), "%s.%06d %s", - ts, (int) (dt % USECS_PER_SEC), zone); + ts, (int) (t % USECS_PER_SEC), zone); return buf; } diff --git a/src/bin/pgbench/pgbench.h b/src/bin/pgbench/pgbench.h index abbdc443a..40903bc16 100644 --- a/src/bin/pgbench/pgbench.h +++ b/src/bin/pgbench/pgbench.h @@ -158,10 +158,10 @@ extern char *expr_scanner_get_substring(PsqlScanState state, extern int expr_scanner_get_lineno(PsqlScanState state, int offset); extern void syntax_error(const char *source, int lineno, const char *line, - const char *cmd, const char *msg, - const char *more, int col) pg_attribute_noreturn(); + const char *command, const char *msg, + const char *more, int column) pg_attribute_noreturn(); -extern bool strtoint64(const char *str, bool errorOK, int64 *pi); -extern bool strtodouble(const char *str, bool errorOK, double *pd); +extern bool strtoint64(const char *str, bool errorOK, int64 *result); +extern bool strtodouble(const char *str, bool errorOK, double *dv); #endif /* PGBENCH_H */ diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index 7872c71f5..bd051e09c 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -127,16 +127,16 @@ bool describeSubscriptions(const char *pattern, bool verbose); /* \dAc */ extern bool listOperatorClasses(const char *access_method_pattern, - const char *opclass_pattern, + const char *type_pattern, bool verbose); /* \dAf */ extern bool listOperatorFamilies(const char *access_method_pattern, - const char *opclass_pattern, + const char *type_pattern, bool verbose); /* \dAo */ -extern bool listOpFamilyOperators(const char *accessMethod_pattern, +extern bool listOpFamilyOperators(const char *access_method_pattern, const char *family_pattern, bool verbose); /* \dAp */ diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h index 84a1be72f..9d91ad87c 100644 --- a/src/bin/scripts/common.h +++ b/src/bin/scripts/common.h @@ -18,7 +18,7 @@ extern void splitTableColumnsSpec(const char *spec, int encoding, char **table, const char **columns); -extern void appendQualifiedRelation(PQExpBuffer buf, const char *name, +extern void appendQualifiedRelation(PQExpBuffer buf, const char *spec, PGconn *conn, bool echo); extern bool yesno_prompt(const char *question); diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 917b19e0e..746e9b4f1 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -381,7 +381,7 @@ static void closePGconn(PGconn *conn); static void release_conn_addrinfo(PGconn *conn); static void sendTerminateConn(PGconn *conn); static PQconninfoOption *conninfo_init(PQExpBuffer errorMessage); -static PQconninfoOption *parse_connection_string(const char *conninfo, +static PQconninfoOption *parse_connection_string(const char *connstr, PQExpBuffer errorMessage, bool use_defaults); static int uri_prefix_length(const char *connstr); static bool recognized_connection_string(const char *connstr); diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index bb874f7f5..ca0b184af 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -2808,7 +2808,7 @@ PQgetCopyData(PGconn *conn, char **buffer, int async) * PQgetline - gets a newline-terminated string from the backend. * * Chiefly here so that applications can use "COPY to stdout" - * and read the output string. Returns a null-terminated string in s. + * and read the output string. Returns a null-terminated string in 'string'. * * XXX this routine is now deprecated, because it can't handle binary data. * If called during a COPY BINARY we return EOF. @@ -2828,11 +2828,11 @@ PQgetCopyData(PGconn *conn, char **buffer, int async) * 1 in other cases (i.e., the buffer was filled before \n is reached) */ int -PQgetline(PGconn *conn, char *s, int maxlen) +PQgetline(PGconn *conn, char *string, int maxlen) { - if (!s || maxlen <= 0) + if (!string || maxlen <= 0) return EOF; - *s = '\0'; + *string = '\0'; /* maxlen must be at least 3 to hold the \. terminator! */ if (maxlen < 3) return EOF; @@ -2840,7 +2840,7 @@ PQgetline(PGconn *conn, char *s, int maxlen) if (!conn) return EOF; - return pqGetline3(conn, s, maxlen); + return pqGetline3(conn, string, maxlen); } /* @@ -2892,9 +2892,9 @@ PQgetlineAsync(PGconn *conn, char *buffer, int bufsize) * send failure. */ int -PQputline(PGconn *conn, const char *s) +PQputline(PGconn *conn, const char *string) { - return PQputnbytes(conn, s, strlen(s)); + return PQputnbytes(conn, string, strlen(string)); } /* diff --git a/src/interfaces/libpq/fe-secure-common.h b/src/interfaces/libpq/fe-secure-common.h index d18db7138..415a93898 100644 --- a/src/interfaces/libpq/fe-secure-common.h +++ b/src/interfaces/libpq/fe-secure-common.h @@ -22,8 +22,8 @@ extern int pq_verify_peer_name_matches_certificate_name(PGconn *conn, const char *namedata, size_t namelen, char **store_name); extern int pq_verify_peer_name_matches_certificate_ip(PGconn *conn, - const unsigned char *addrdata, - size_t addrlen, + const unsigned char *ipdata, + size_t iplen, char **store_name); extern bool pq_verify_peer_name_matches_certificate(PGconn *conn); diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index 3798bb3f1..aea466173 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -68,14 +68,14 @@ static int verify_cb(int ok, X509_STORE_CTX *ctx); static int openssl_verify_peer_name_matches_certificate_name(PGconn *conn, - ASN1_STRING *name, + ASN1_STRING *name_entry, char **store_name); static int openssl_verify_peer_name_matches_certificate_ip(PGconn *conn, ASN1_OCTET_STRING *addr_entry, char **store_name); static void destroy_ssl_system(void); static int initialize_SSL(PGconn *conn); -static PostgresPollingStatusType open_client_SSL(PGconn *); +static PostgresPollingStatusType open_client_SSL(PGconn *conn); static char *SSLerrmessage(unsigned long ecode); static void SSLerrfree(char *buf); static int PQssl_passwd_cb(char *buf, int size, int rwflag, void *userdata); diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 7986445f1..f7a5db4c2 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -483,7 +483,7 @@ extern int PQputCopyEnd(PGconn *conn, const char *errormsg); extern int PQgetCopyData(PGconn *conn, char **buffer, int async); /* Deprecated routines for copy in/out */ -extern int PQgetline(PGconn *conn, char *string, int length); +extern int PQgetline(PGconn *conn, char *string, int maxlen); extern int PQputline(PGconn *conn, const char *string); extern int PQgetlineAsync(PGconn *conn, char *buffer, int bufsize); extern int PQputnbytes(PGconn *conn, const char *buffer, int nbytes); @@ -591,7 +591,7 @@ extern unsigned char *PQescapeBytea(const unsigned char *from, size_t from_lengt extern void PQprint(FILE *fout, /* output stream */ const PGresult *res, - const PQprintOpt *ps); /* option structure */ + const PQprintOpt *po); /* option structure */ /* * really old printing routines diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 7bd2a9fff..a64734294 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -374,7 +374,7 @@ static ParamListInfo setup_param_list(PLpgSQL_execstate *estate, PLpgSQL_expr *expr); static ParamExternData *plpgsql_param_fetch(ParamListInfo params, int paramid, bool speculative, - ParamExternData *workspace); + ParamExternData *prm); static void plpgsql_param_compile(ParamListInfo params, Param *param, ExprState *state, Datum *resv, bool *resnull); diff --git a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h index c438cfb82..298386cb7 100644 --- a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h +++ b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h @@ -172,52 +172,70 @@ bool ecpg_get_data(const PGresult *, int, int, int, enum ECPGttype type, #ifdef ENABLE_THREAD_SAFETY void ecpg_pthreads_init(void); #endif -struct connection *ecpg_get_connection(const char *); -char *ecpg_alloc(long, int); -char *ecpg_auto_alloc(long, int); -char *ecpg_realloc(void *, long, int); -void ecpg_free(void *); -bool ecpg_init(const struct connection *, const char *, const int); -char *ecpg_strdup(const char *, int); -const char *ecpg_type_name(enum ECPGttype); -int ecpg_dynamic_type(Oid); -int sqlda_dynamic_type(Oid, enum COMPAT_MODE); +struct connection *ecpg_get_connection(const char *connection_name); +char *ecpg_alloc(long size, int lineno); +char *ecpg_auto_alloc(long size, int lineno); +char *ecpg_realloc(void *ptr, long size, int lineno); +void ecpg_free(void *ptr); +bool ecpg_init(const struct connection *con, + const char *connection_name, + const int lineno); +char *ecpg_strdup(const char *string, int lineno); +const char *ecpg_type_name(enum ECPGttype typ); +int ecpg_dynamic_type(Oid type); +int sqlda_dynamic_type(Oid type, enum COMPAT_MODE compat); void ecpg_clear_auto_mem(void); struct descriptor *ecpg_find_desc(int line, const char *name); -struct prepared_statement *ecpg_find_prepared_statement(const char *, - struct connection *, struct prepared_statement **); +struct prepared_statement *ecpg_find_prepared_statement(const char *name, + struct connection *con, + struct prepared_statement **prev_); bool ecpg_store_result(const PGresult *results, int act_field, const struct statement *stmt, struct variable *var); -bool ecpg_store_input(const int, const bool, const struct variable *, char **, bool); +bool ecpg_store_input(const int lineno, const bool force_indicator, + const struct variable *var, + char **tobeinserted_p, bool quote); void ecpg_free_params(struct statement *stmt, bool print); -bool ecpg_do_prologue(int, const int, const int, const char *, const bool, - enum ECPG_statement_type, const char *, va_list, - struct statement **); -bool ecpg_build_params(struct statement *); +bool ecpg_do_prologue(int lineno, const int compat, + const int force_indicator, const char *connection_name, + const bool questionmarks, enum ECPG_statement_type statement_type, + const char *query, va_list args, + struct statement **stmt_out); +bool ecpg_build_params(struct statement *stmt); bool ecpg_autostart_transaction(struct statement *stmt); bool ecpg_execute(struct statement *stmt); -bool ecpg_process_output(struct statement *, bool); -void ecpg_do_epilogue(struct statement *); -bool ecpg_do(const int, const int, const int, const char *, const bool, - const int, const char *, va_list); +bool ecpg_process_output(struct statement *stmt, bool clear_result); +void ecpg_do_epilogue(struct statement *stmt); +bool ecpg_do(const int lineno, const int compat, + const int force_indicator, const char *connection_name, + const bool questionmarks, const int st, const char *query, + va_list args); -bool ecpg_check_PQresult(PGresult *, int, PGconn *, enum COMPAT_MODE); +bool ecpg_check_PQresult(PGresult *results, int lineno, + PGconn *connection, enum COMPAT_MODE compat); void ecpg_raise(int line, int code, const char *sqlstate, const char *str); void ecpg_raise_backend(int line, PGresult *result, PGconn *conn, int compat); -char *ecpg_prepared(const char *, struct connection *); -bool ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *conn); +char *ecpg_prepared(const char *name, struct connection *con); +bool ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *con); void ecpg_log(const char *format,...) pg_attribute_printf(1, 2); -bool ecpg_auto_prepare(int, const char *, const int, char **, const char *); -bool ecpg_register_prepared_stmt(struct statement *); +bool ecpg_auto_prepare(int lineno, const char *connection_name, + const int compat, char **name, + const char *query); +bool ecpg_register_prepared_stmt(struct statement *stmt); void ecpg_init_sqlca(struct sqlca_t *sqlca); -struct sqlda_compat *ecpg_build_compat_sqlda(int, PGresult *, int, enum COMPAT_MODE); -void ecpg_set_compat_sqlda(int, struct sqlda_compat **, const PGresult *, int, enum COMPAT_MODE); -struct sqlda_struct *ecpg_build_native_sqlda(int, PGresult *, int, enum COMPAT_MODE); -void ecpg_set_native_sqlda(int, struct sqlda_struct **, const PGresult *, int, enum COMPAT_MODE); +struct sqlda_compat *ecpg_build_compat_sqlda(int line, PGresult *res, int row, + enum COMPAT_MODE compat); +void ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, + const PGresult *res, int row, + enum COMPAT_MODE compat); +struct sqlda_struct *ecpg_build_native_sqlda(int line, PGresult *res, int row, + enum COMPAT_MODE compat); +void ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, + const PGresult *res, int row, + enum COMPAT_MODE compat); unsigned ecpg_hex_dec_len(unsigned srclen); unsigned ecpg_hex_enc_len(unsigned srclen); unsigned ecpg_hex_encode(const char *src, unsigned len, char *dst); diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h index 893c9b619..1ec38791f 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt.h +++ b/src/interfaces/ecpg/pgtypeslib/dt.h @@ -311,22 +311,22 @@ do { \ #define TIMESTAMP_IS_NOEND(j) ((j) == DT_NOEND) #define TIMESTAMP_NOT_FINITE(j) (TIMESTAMP_IS_NOBEGIN(j) || TIMESTAMP_IS_NOEND(j)) -int DecodeInterval(char **, int *, int, int *, struct tm *, fsec_t *); -int DecodeTime(char *, int *, struct tm *, fsec_t *); +int DecodeInterval(char **field, int *ftype, int nf, int *dtype, struct tm *tm, fsec_t *fsec); +int DecodeTime(char *str, int *tmask, struct tm *tm, fsec_t *fsec); void EncodeDateTime(struct tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str, bool EuroDates); void EncodeInterval(struct tm *tm, fsec_t fsec, int style, char *str); -int tm2timestamp(struct tm *, fsec_t, int *, timestamp *); +int tm2timestamp(struct tm *tm, fsec_t fsec, int *tzp, timestamp *result); int DecodeUnits(int field, char *lowtoken, int *val); bool CheckDateTokenTables(void); void EncodeDateOnly(struct tm *tm, int style, char *str, bool EuroDates); -int GetEpochTime(struct tm *); -int ParseDateTime(char *, char *, char **, int *, int *, char **); -int DecodeDateTime(char **, int *, int, int *, struct tm *, fsec_t *, bool); -void j2date(int, int *, int *, int *); -void GetCurrentDateTime(struct tm *); -int date2j(int, int, int); -void TrimTrailingZeros(char *); -void dt2time(double, int *, int *, int *, fsec_t *); +int GetEpochTime(struct tm *tm); +int ParseDateTime(char *timestr, char *lowstr, char **field, int *ftype, int *numfields, char **endstr); +int DecodeDateTime(char **field, int *ftype, int nf, int *dtype, struct tm *tm, fsec_t *fsec, bool EuroDates); +void j2date(int jd, int *year, int *month, int *day); +void GetCurrentDateTime(struct tm *tm); +int date2j(int y, int m, int d); +void TrimTrailingZeros(char *str); +void dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec); int PGTYPEStimestamp_defmt_scan(char **str, char *fmt, timestamp * d, int *year, int *month, int *day, int *hour, int *minute, int *second, diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c index e51c03610..14f20e2d2 100644 --- a/src/interfaces/ecpg/preproc/c_keywords.c +++ b/src/interfaces/ecpg/preproc/c_keywords.c @@ -33,7 +33,7 @@ static const uint16 ScanCKeywordTokens[] = { * ScanKeywordLookup(), except we want case-sensitive matching. */ int -ScanCKeywordLookup(const char *str) +ScanCKeywordLookup(const char *text) { size_t len; int h; @@ -43,7 +43,7 @@ ScanCKeywordLookup(const char *str) * Reject immediately if too long to be any keyword. This saves useless * hashing work on long strings. */ - len = strlen(str); + len = strlen(text); if (len > ScanCKeywords.max_kw_len) return -1; @@ -51,7 +51,7 @@ ScanCKeywordLookup(const char *str) * Compute the hash function. Since it's a perfect hash, we need only * match to the specific keyword it identifies. */ - h = ScanCKeywords_hash_func(str, len); + h = ScanCKeywords_hash_func(text, len); /* An out-of-range result implies no match */ if (h < 0 || h >= ScanCKeywords.num_keywords) @@ -59,7 +59,7 @@ ScanCKeywordLookup(const char *str) kw = GetScanKeyword(h, &ScanCKeywords); - if (strcmp(kw, str) == 0) + if (strcmp(kw, text) == 0) return ScanCKeywordTokens[h]; return -1; diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c index cf8aadd0b..6c0b8a27b 100644 --- a/src/interfaces/ecpg/preproc/output.c +++ b/src/interfaces/ecpg/preproc/output.c @@ -4,7 +4,7 @@ #include "preproc_extern.h" -static void output_escaped_str(char *cmd, bool quoted); +static void output_escaped_str(char *str, bool quoted); void output_line_number(void) diff --git a/src/interfaces/ecpg/preproc/preproc_extern.h b/src/interfaces/ecpg/preproc/preproc_extern.h index 6be59b719..732556a0a 100644 --- a/src/interfaces/ecpg/preproc/preproc_extern.h +++ b/src/interfaces/ecpg/preproc/preproc_extern.h @@ -75,8 +75,8 @@ extern int base_yylex(void); extern void base_yyerror(const char *); extern void *mm_alloc(size_t); extern char *mm_strdup(const char *); -extern void mmerror(int errorcode, enum errortype type, const char *error,...) pg_attribute_printf(3, 4); -extern void mmfatal(int errorcode, const char *error,...) pg_attribute_printf(2, 3) pg_attribute_noreturn(); +extern void mmerror(int error_code, enum errortype type, const char *error,...) pg_attribute_printf(3, 4); +extern void mmfatal(int error_code, const char *error,...) pg_attribute_printf(2, 3) pg_attribute_noreturn(); extern void output_get_descr_header(char *); extern void output_get_descr(char *, char *); extern void output_set_descr_header(char *); diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index d4b4da5ff..58119d110 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -233,7 +233,7 @@ get_type(enum ECPGttype type) */ static void ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type, char *varcharsize, - char *arrsize, const char *size, const char *prefix, int); + char *arrsize, const char *size, const char *prefix, int counter); static void ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, char *arrsize, struct ECPGtype *type, struct ECPGtype *ind_type, const char *prefix, const char *ind_prefix); -- 2.34.1