diff options
Diffstat (limited to 'src/include')
69 files changed, 116 insertions, 114 deletions
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 49d4ad560f1..89f5b01b31a 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/commands/alter.h b/src/include/commands/alter.h index 52f5e6f6d2f..fddfa3b850e 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 ab736fb6263..da313652725 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/matview.h b/src/include/commands/matview.h index a067da39d29..7fbb2564aef 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 c5f3753da2c..f05bb66c61e 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 57df3fc1e3d..2491196570a 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 8c21f2a2c98..e6eb2aaa601 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 1577988f1d5..d8dec996511 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 d38c0e23889..b3b04ccfa95 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 0c48654b96b..03f14d6be1e 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 1f809071122..a11c9e9473d 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 b7b6bd6008c..b0a928bbe85 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 a17bedb8514..532bc49c386 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 63f2b6a802d..a1751b370d4 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 48d7f08b838..8384e33a5a8 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 d1f840c11c7..e1f5e786e01 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/fe_utils/cancel.h b/src/include/fe_utils/cancel.h index 3b84daf6eb6..c256b04f4fb 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 5dd2181787a..6bcd9e07834 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 8ce63c93731..199df9bb00f 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 83e181a2250..934952f31d6 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 9261a7b0a44..757fd6ac5a4 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 fa4deb24978..0927cb19b9c 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 75538110fc4..ac82125530c 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 dc3d819a1c7..10dbe3981e5 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 6687c8f4ceb..0d7b43d830d 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/nodes/extensible.h b/src/include/nodes/extensible.h index 34936db894e..820b904841c 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 cdd6debfa0e..a80f43e540a 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 de2dd907e10..543543d6867 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 a6e04d04a3d..dc991626ba0 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 5e83b843dcd..91878e8b98b 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 5e80a741a42..28568fab57a 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 6c5203dc448..ff242d1b6dc 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 9e91da7114f..f27d11eaa9f 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -117,7 +117,7 @@ extern void cost_incremental_sort(Path *path, double limit_tuples); extern Cost cost_sort_estimate(PlannerInfo *root, List *pathkeys, int nPresortedKeys, double tuples); -extern void cost_append(AppendPath *path, PlannerInfo *root); +extern void cost_append(AppendPath *apath, PlannerInfo *root); extern void cost_merge_append(Path *path, PlannerInfo *root, List *pathkeys, int n_streams, Cost input_startup_cost, Cost input_total_cost, @@ -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 d11cdac7f8d..881386997c3 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 1566f435b37..9dffdcfd1e6 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 2b11ff1d1fe..5b4f350b333 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 dc379547c70..3d3a5918c2f 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 c56822f645c..0856af5b431 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 e15b6229048..7a57b199bf1 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 de21c3c6497..484db165dbf 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 b1e3f1b8400..1f5b706d831 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 ac28f813b4e..ad7334a0d21 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 1c44be8baa9..9ee59060017 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 fe48618df7b..3562d471b51 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 96975bdc92f..271b9461673 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 6436724f3db..d4c33c844f4 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/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index 98b9b3a2881..f001ca41bbc 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 bf172d5b9bd..ef5a5464067 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 71f852c157b..906919d88ec 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 bb7ef1240e0..0351927a210 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/tcop/cmdtag.h b/src/include/tcop/cmdtag.h index b9e8992a498..60e3179c74e 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 c36c711dae0..fd73b384407 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 3d6411197ce..9a4df3a5dac 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 ee37af95001..49ae647216f 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 221c3e6c3de..81631f16454 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 4527e825177..2cae346beb0 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/jsonb.h b/src/include/utils/jsonb.h index 4cbe6edf218..b03c17d73bd 100644 --- a/src/include/utils/jsonb.h +++ b/src/include/utils/jsonb.h @@ -379,13 +379,13 @@ typedef struct JsonbIterator extern uint32 getJsonbOffset(const JsonbContainer *jc, int index); extern uint32 getJsonbLength(const JsonbContainer *jc, int index); extern int compareJsonbContainers(JsonbContainer *a, JsonbContainer *b); -extern JsonbValue *findJsonbValueFromContainer(JsonbContainer *sheader, +extern JsonbValue *findJsonbValueFromContainer(JsonbContainer *container, uint32 flags, JsonbValue *key); extern JsonbValue *getKeyJsonValueFromContainer(JsonbContainer *container, const char *keyVal, int keyLen, JsonbValue *res); -extern JsonbValue *getIthJsonbValueFromContainer(JsonbContainer *sheader, +extern JsonbValue *getIthJsonbValueFromContainer(JsonbContainer *container, uint32 i); extern JsonbValue *pushJsonbValue(JsonbParseState **pstate, JsonbIteratorToken seq, JsonbValue *jbval); @@ -406,7 +406,7 @@ extern char *JsonbToCString(StringInfo out, JsonbContainer *in, extern char *JsonbToCStringIndent(StringInfo out, JsonbContainer *in, int estimated_len); extern bool JsonbExtractScalar(JsonbContainer *jbc, JsonbValue *res); -extern const char *JsonbTypeName(JsonbValue *jb); +extern const char *JsonbTypeName(JsonbValue *val); extern Datum jsonb_set_element(Jsonb *jb, Datum *path, int path_len, JsonbValue *newval); diff --git a/src/include/utils/multirangetypes.h b/src/include/utils/multirangetypes.h index 915330f990b..bc3339205b9 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 3caa74dfe7a..09d355e8187 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 901d2041d66..40a36028554 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 993fad4fc2a..b62f1ea4810 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 a36ceba7ad7..0e2965ff934 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 ba35d6b3b3c..73106b6fc05 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 2bb2e255fdb..92f1f779a41 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 d485b9bfcd9..49af4ed2ede 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 06eafdf118a..9f4dd5360af 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 edf3a973186..820c08941c8 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 e82b5a638d2..44412749906 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 6620a626191..bfd0abf9c14 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); |