diff options
Diffstat (limited to 'src/backend')
40 files changed, 134 insertions, 132 deletions
diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c index 1f1cff1a58b..dd103a8689f 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 58752368e7e..22635f80947 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/commands/event_trigger.c b/src/backend/commands/event_trigger.c index 635d05405e1..441f29d684f 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 053d2ca5ae4..f86983c6601 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 cf98d9e600b..fd56066c133 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 b97b8b0435c..b0747ce291e 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 7a931ab758d..775553ec7be 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 a583aa4304b..1346104973f 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 e3233a8f385..6c52edd9bee 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 5ad18d2de4b..6f5a5262c73 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/lib/dshash.c b/src/backend/lib/dshash.c index c5c032a593b..d39cde9cc73 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 41d3abdb09c..345cd1b3a54 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 03565573876..cb702e0fde2 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 50f678a4937..fd3f6894d80 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/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index cd8a3ef7cb7..ab4d8e201df 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 c0bdc77d390..8014d1fd250 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -3086,13 +3086,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 5012bfe1425..6d5718ee4cb 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 c6ec694cebc..d76c0af3940 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 061d0bcc505..202a38f813d 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 6d283006e3d..bd068bba05e 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 57c9b51814c..7f74ed212f8 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 de1184ad7b7..383bc4776ef 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/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index ee05e230e06..ab97e71dd79 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/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 43fff50d490..350039cc866 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 f1b632ef3cb..d78002b901d 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/jsonb.c b/src/backend/utils/adt/jsonb.c index 88b0000f9a9..9e14922ec24 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -188,12 +188,12 @@ JsonbContainerTypeName(JsonbContainer *jbc) * Get the type name of a jsonb value. */ const char * -JsonbTypeName(JsonbValue *jbv) +JsonbTypeName(JsonbValue *val) { - switch (jbv->type) + switch (val->type) { case jbvBinary: - return JsonbContainerTypeName(jbv->val.binary.data); + return JsonbContainerTypeName(val->val.binary.data); case jbvObject: return "object"; case jbvArray: @@ -207,7 +207,7 @@ JsonbTypeName(JsonbValue *jbv) case jbvNull: return "null"; case jbvDatetime: - switch (jbv->val.datetime.typid) + switch (val->val.datetime.typid) { case DATEOID: return "date"; @@ -221,11 +221,11 @@ JsonbTypeName(JsonbValue *jbv) return "timestamp with time zone"; default: elog(ERROR, "unrecognized jsonb value datetime type: %d", - jbv->val.datetime.typid); + val->val.datetime.typid); } return "unknown"; default: - elog(ERROR, "unrecognized jsonb value type: %d", jbv->type); + elog(ERROR, "unrecognized jsonb value type: %d", val->type); return "unknown"; } } diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c index 60442758b32..7d6a1ed2345 100644 --- a/src/backend/utils/adt/jsonb_util.c +++ b/src/backend/utils/adt/jsonb_util.c @@ -57,13 +57,13 @@ static short padBufferToInt(StringInfo buffer); static JsonbIterator *iteratorFromContainer(JsonbContainer *container, JsonbIterator *parent); static JsonbIterator *freeAndGetParent(JsonbIterator *it); static JsonbParseState *pushState(JsonbParseState **pstate); -static void appendKey(JsonbParseState *pstate, JsonbValue *scalarVal); +static void appendKey(JsonbParseState *pstate, JsonbValue *string); static void appendValue(JsonbParseState *pstate, JsonbValue *scalarVal); static void appendElement(JsonbParseState *pstate, JsonbValue *scalarVal); static int lengthCompareJsonbStringValue(const void *a, const void *b); static int lengthCompareJsonbString(const char *val1, int len1, const char *val2, int len2); -static int lengthCompareJsonbPair(const void *a, const void *b, void *arg); +static int lengthCompareJsonbPair(const void *a, const void *b, void *binequal); static void uniqueifyJsonbObject(JsonbValue *object); static JsonbValue *pushJsonbValueScalar(JsonbParseState **pstate, JsonbIteratorToken seq, @@ -1394,22 +1394,22 @@ JsonbHashScalarValueExtended(const JsonbValue *scalarVal, uint64 *hash, * Are two scalar JsonbValues of the same type a and b equal? */ static bool -equalsJsonbScalarValue(JsonbValue *aScalar, JsonbValue *bScalar) +equalsJsonbScalarValue(JsonbValue *a, JsonbValue *b) { - if (aScalar->type == bScalar->type) + if (a->type == b->type) { - switch (aScalar->type) + switch (a->type) { case jbvNull: return true; case jbvString: - return lengthCompareJsonbStringValue(aScalar, bScalar) == 0; + return lengthCompareJsonbStringValue(a, b) == 0; case jbvNumeric: return DatumGetBool(DirectFunctionCall2(numeric_eq, - PointerGetDatum(aScalar->val.numeric), - PointerGetDatum(bScalar->val.numeric))); + PointerGetDatum(a->val.numeric), + PointerGetDatum(b->val.numeric))); case jbvBool: - return aScalar->val.boolean == bScalar->val.boolean; + return a->val.boolean == b->val.boolean; default: elog(ERROR, "invalid jsonb scalar type"); @@ -1426,28 +1426,28 @@ equalsJsonbScalarValue(JsonbValue *aScalar, JsonbValue *bScalar) * operators, where a lexical sort order is generally expected. */ static int -compareJsonbScalarValue(JsonbValue *aScalar, JsonbValue *bScalar) +compareJsonbScalarValue(JsonbValue *a, JsonbValue *b) { - if (aScalar->type == bScalar->type) + if (a->type == b->type) { - switch (aScalar->type) + switch (a->type) { case jbvNull: return 0; case jbvString: - return varstr_cmp(aScalar->val.string.val, - aScalar->val.string.len, - bScalar->val.string.val, - bScalar->val.string.len, + return varstr_cmp(a->val.string.val, + a->val.string.len, + b->val.string.val, + b->val.string.len, DEFAULT_COLLATION_OID); case jbvNumeric: return DatumGetInt32(DirectFunctionCall2(numeric_cmp, - PointerGetDatum(aScalar->val.numeric), - PointerGetDatum(bScalar->val.numeric))); + PointerGetDatum(a->val.numeric), + PointerGetDatum(b->val.numeric))); case jbvBool: - if (aScalar->val.boolean == bScalar->val.boolean) + if (a->val.boolean == b->val.boolean) return 0; - else if (aScalar->val.boolean > bScalar->val.boolean) + else if (a->val.boolean > b->val.boolean) return 1; else return -1; @@ -1608,13 +1608,13 @@ convertJsonbValue(StringInfo buffer, JEntry *header, JsonbValue *val, int level) } static void -convertJsonbArray(StringInfo buffer, JEntry *pheader, JsonbValue *val, int level) +convertJsonbArray(StringInfo buffer, JEntry *header, JsonbValue *val, int level) { int base_offset; int jentry_offset; int i; int totallen; - uint32 header; + uint32 containerhead; int nElems = val->val.array.nElems; /* Remember where in the buffer this array starts. */ @@ -1627,15 +1627,15 @@ convertJsonbArray(StringInfo buffer, JEntry *pheader, JsonbValue *val, int level * Construct the header Jentry and store it in the beginning of the * variable-length payload. */ - header = nElems | JB_FARRAY; + containerhead = nElems | JB_FARRAY; if (val->val.array.rawScalar) { Assert(nElems == 1); Assert(level == 0); - header |= JB_FSCALAR; + containerhead |= JB_FSCALAR; } - appendToBuffer(buffer, (char *) &header, sizeof(uint32)); + appendToBuffer(buffer, (char *) &containerhead, sizeof(uint32)); /* Reserve space for the JEntries of the elements. */ jentry_offset = reserveFromBuffer(buffer, sizeof(JEntry) * nElems); @@ -1688,17 +1688,17 @@ convertJsonbArray(StringInfo buffer, JEntry *pheader, JsonbValue *val, int level JENTRY_OFFLENMASK))); /* Initialize the header of this node in the container's JEntry array */ - *pheader = JENTRY_ISCONTAINER | totallen; + *header = JENTRY_ISCONTAINER | totallen; } static void -convertJsonbObject(StringInfo buffer, JEntry *pheader, JsonbValue *val, int level) +convertJsonbObject(StringInfo buffer, JEntry *header, JsonbValue *val, int level) { int base_offset; int jentry_offset; int i; int totallen; - uint32 header; + uint32 containerheader; int nPairs = val->val.object.nPairs; /* Remember where in the buffer this object starts. */ @@ -1711,8 +1711,8 @@ convertJsonbObject(StringInfo buffer, JEntry *pheader, JsonbValue *val, int leve * Construct the header Jentry and store it in the beginning of the * variable-length payload. */ - header = nPairs | JB_FOBJECT; - appendToBuffer(buffer, (char *) &header, sizeof(uint32)); + containerheader = nPairs | JB_FOBJECT; + appendToBuffer(buffer, (char *) &containerheader, sizeof(uint32)); /* Reserve space for the JEntries of the keys and values. */ jentry_offset = reserveFromBuffer(buffer, sizeof(JEntry) * nPairs * 2); @@ -1804,11 +1804,11 @@ convertJsonbObject(StringInfo buffer, JEntry *pheader, JsonbValue *val, int leve JENTRY_OFFLENMASK))); /* Initialize the header of this node in the container's JEntry array */ - *pheader = JENTRY_ISCONTAINER | totallen; + *header = JENTRY_ISCONTAINER | totallen; } static void -convertJsonbScalar(StringInfo buffer, JEntry *jentry, JsonbValue *scalarVal) +convertJsonbScalar(StringInfo buffer, JEntry *header, JsonbValue *scalarVal) { int numlen; short padlen; @@ -1816,13 +1816,13 @@ convertJsonbScalar(StringInfo buffer, JEntry *jentry, JsonbValue *scalarVal) switch (scalarVal->type) { case jbvNull: - *jentry = JENTRY_ISNULL; + *header = JENTRY_ISNULL; break; case jbvString: appendToBuffer(buffer, scalarVal->val.string.val, scalarVal->val.string.len); - *jentry = scalarVal->val.string.len; + *header = scalarVal->val.string.len; break; case jbvNumeric: @@ -1831,11 +1831,11 @@ convertJsonbScalar(StringInfo buffer, JEntry *jentry, JsonbValue *scalarVal) appendToBuffer(buffer, (char *) scalarVal->val.numeric, numlen); - *jentry = JENTRY_ISNUMERIC | (padlen + numlen); + *header = JENTRY_ISNUMERIC | (padlen + numlen); break; case jbvBool: - *jentry = (scalarVal->val.boolean) ? + *header = (scalarVal->val.boolean) ? JENTRY_ISBOOL_TRUE : JENTRY_ISBOOL_FALSE; break; @@ -1851,7 +1851,7 @@ convertJsonbScalar(StringInfo buffer, JEntry *jentry, JsonbValue *scalarVal) len = strlen(buf); appendToBuffer(buffer, buf, len); - *jentry = len; + *header = len; } break; diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 9f4192e0798..8d83b2edb35 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -252,7 +252,7 @@ static int JsonbType(JsonbValue *jb); static JsonbValue *getScalar(JsonbValue *scalar, enum jbvType type); static JsonbValue *wrapItemsInArray(const JsonValueList *items); static int compareDatetime(Datum val1, Oid typid1, Datum val2, Oid typid2, - bool useTz, bool *have_error); + bool useTz, bool *cast_error); /****************** User interface to JsonPath executor ********************/ diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index e02fc3725ad..8e671b9faba 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 920a63b0081..85ee9ec4260 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 aa4c53e0ae1..b09cb49054c 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 51b3fdc9a01..1d503e7e011 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 021b760f4e5..9799647e1a5 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 606088cdfcc..d32cb11436e 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 e7345e1410f..62665686054 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 96c694da8fd..eb724a9d7f2 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/misc/guc.c b/src/backend/utils/misc/guc.c index b11d609bbea..8c2e08fad6a 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 a67487e5fe8..6e75acda274 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 7ad4429ad3d..afa5bdbf042 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 9b504c9745d..f1f2ddac17c 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; } |