8000 Harmonize function parameter names for Postgres 17. · postgrespro/postgres@6207f08 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6207f08

Browse files
petergeogheganpetergeoghegan
committed
Harmonize function parameter names for Postgres 17.
Make sure that function declarations use names that exactly match the corresponding names from function definitions in a few places. These inconsistencies were all introduced during Postgres 17 development. pg_bsd_indent still has a couple of similar inconsistencies, which I (pgeoghegan) have left untouched for now. This commit was written with help from clang-tidy, by mechanically applying the same rules as similar clean-up commits (the earliest such commit was commit 035ce1f).
1 parent a0fe90e commit 6207f08

File tree

27 files changed

+65
-63
lines changed

27 files changed

+65
-63
lines changed

‎src/backend/access/brin/brin.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,11 @@ static void _brin_begin_parallel(BrinBuildState *buildstate, Relation heap, Rela
229229
bool isconcurrent, int request);
230230
static void _brin_end_parallel(BrinLeader *brinleader, BrinBuildState *state);
231231
static Size _brin_parallel_estimate_shared(Relation heap, Snapshot snapshot);
232-
static double _brin_parallel_heapscan(BrinBuildState *buildstate);
233-
static double _brin_parallel_merge(BrinBuildState *buildstate);
232+
static double _brin_parallel_heapscan(BrinBuildState *state);
233+
static double _brin_parallel_merge(BrinBuildState *state);
234234
static void _brin_leader_participate_as_worker(BrinBuildState *buildstate,
235235
Relation heap, Relation index);
236-
static void _brin_parallel_scan_and_build(BrinBuildState *buildstate,
236+
static void _brin_parallel_scan_and_build(BrinBuildState *state,
237237
BrinShared *brinshared,
238238
Sharedsort *sharedsort,
239239
Relation heap, Relation index,

‎src/backend/access/heap/vacuumlazy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ static void lazy_vacuum(LVRelState *vacrel);
246246
static bool lazy_vacuum_all_indexes(LVRelState *vacrel);
247247
static void lazy_vacuum_heap_rel(LVRelState *vacrel);
248248
static void lazy_vacuum_heap_page(LVRelState *vacrel, BlockNumber blkno,
249-
Buffer buffer, OffsetNumber *offsets,
249+
Buffer buffer, OffsetNumber *deadoffsets,
250250
int num_offsets, Buffer vmbuffer);
251251
static bool lazy_check_wraparound_failsafe(LVRelState *vacrel);
252252
static void lazy_cleanup_all_indexes(LVRelState *vacrel);

‎src/backend/backup/basebackup_incremental.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static void manifest_process_wal_range(JsonManifestParseContext *context,
141141
TimeLineID tli,
142142
XLogRecPtr start_lsn,
143143
XLogRecPtr end_lsn);
144-
static void manifest_report_error(JsonManifestParseContext *ib,
144+
static void manifest_report_error(JsonManifestParseContext *context,
145145
const char *fmt,...)
146146
pg_attribute_printf(2, 3) pg_attribute_noreturn();
147147
static int compare_block_numbers(const void *a, const void *b);

‎src/backend/backup/basebackup_zstd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef struct bbsink_zstd
3434

3535
static void bbsink_zstd_begin_backup(bbsink *sink);
3636
static void bbsink_zstd_begin_archive(bbsink *sink, const char *archive_name);
37-
static void bbsink_zstd_archive_contents(bbsink *sink, size_t avail_in);
37+
static void bbsink_zstd_archive_contents(bbsink *sink, size_t len);
3838
static void bbsink_zstd_manifest_contents(bbsink *sink, size_t len);
3939
static void bbsink_zstd_end_archive(bbsink *sink);
4040
static void bbsink_zstd_cleanup(bbsink *sink);

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ static ObjectAddress ATExecClusterOn(Relation rel, const char *indexName,
589589
LOCKMODE lockmode);
590590
static void ATExecDropCluster(Relation rel, LOCKMODE lockmode);
591591
static void ATPrepSetAccessMethod(AlteredTableInfo *tab, Relation rel, const char *amname);
592-
static void ATExecSetAccessMethodNoStorage(Relation rel, Oid newAccessMethod);
592+
static void ATExecSetAccessMethodNoStorage(Relation rel, Oid newAccessMethodId);
593593
static bool ATPrepChangePersistence(Relation rel, bool toLogged);
594594
static void ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel,
595595
const char *tablespacename, LOCKMODE lockmode);

‎src/backend/optimizer/path/joinrels.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static void try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1,
4545
static SpecialJoinInfo *build_child_join_sjinfo(PlannerInfo *root,
4646
SpecialJoinInfo *parent_sjinfo,
4747
Relids left_relids, Relids right_relids);
48-
static void free_child_join_sjinfo(SpecialJoinInfo *child_sjinfo);
48+
static void free_child_join_sjinfo(SpecialJoinInfo *sjinfo);
4949
static void compute_partition_bounds(PlannerInfo *root, RelOptInfo *rel1,
5050
RelOptInfo *rel2, RelOptInfo *joinrel,
5151
SpecialJoinInfo *parent_sjinfo,

‎src/backend/parser/parse_expr.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ static Node *transformJsonArrayQueryConstructor(ParseState *pstate,
8888
static Node *transformJsonObjectAgg(ParseState *pstate, JsonObjectAgg *agg);
8989
static Node *transformJsonArrayAgg(ParseState *pstate, JsonArrayAgg *agg);
9090
static Node *transformJsonIsPredicate(ParseState *pstate, JsonIsPredicate *pred);
91-
static Node *transformJsonParseExpr(ParseState *pstate, JsonParseExpr *expr);
92-
static Node *transformJsonScalarExpr(ParseState *pstate, JsonScalarExpr *expr);
91+
static Node *transformJsonParseExpr(ParseState *pstate, JsonParseExpr *jsexpr);
92+
static Node *transformJsonScalarExpr(ParseState *pstate, JsonScalarExpr *jsexpr);
9393
static Node *transformJsonSerializeExpr(ParseState *pstate,
9494
JsonSerializeExpr *expr);
95-
static Node *transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *p);
95+
static Node *transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func);
9696
static void transformJsonPassingArgs(ParseState *pstate, const char *constructName,
9797
JsonFormatType format, List *args,
9898
List **passing_values, List **passing_names);

‎src/backend/replication/libpqwalreceiver/libpqwalreceiver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static void libpqrcv_get_senderinfo(WalReceiverConn *conn,
5959
char **sender_host, int *sender_port);
6060
static char *libpqrcv_identify_system(WalReceiverConn *conn,
6161
TimeLineID *primary_tli);
62-
static char *libpqrcv_get_dbname_from_conninfo(const char *conninfo);
62+
static char *libpqrcv_get_dbname_from_conninfo(const char *connInfo);
6363
static int libpqrcv_server_version(WalReceiverConn *conn);
6464
static void libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn,
6565
TimeLineID tli, char **filename,

‎src/backend/utils/adt/jsonpath_exec.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ static void getJsonPathVariable(JsonPathExecContext *cxt,
318318
JsonPathItem *variable, JsonbValue *value);
319319
static int countVariablesFromJsonb(void *varsJsonb);
320320
static JsonbValue *getJsonPathVariableFromJsonb(void *varsJsonb, char *varName,
321-
int varNameLen,
321+
int varNameLength,
322322
JsonbValue *baseObject,
323323
int *baseObjectId);
324324
static int JsonbArraySize(JsonbValue *jb);
@@ -342,7 +342,6 @@ static void JsonValueListInitIterator(const JsonValueList *jvl,
342342
JsonValueListIterator *it);
343343
static JsonbValue *JsonValueListNext(const JsonValueList *jvl,
344344
JsonValueListIterator *it);
345-
static int JsonbType(JsonbValue *jb);
346345
static JsonbValue *JsonbInitBinary(JsonbValue *jbv, Jsonb *jb);
347346
static int JsonbType(JsonbValue *jb);
348347
static JsonbValue *getScalar(JsonbValue *scalar, enum jbvType type);
@@ -359,7 +358,7 @@ static JsonTablePlanState *JsonTableInitPlan(JsonTableExecContext *cxt,
359358
List *args,
360359
MemoryContext mcxt);
361360
static void JsonTableSetDocument(TableFuncScanState *state, Datum value);
362-
static void JsonTableResetRowPattern(JsonTablePlanState *plan, Datum item);
361+
static void JsonTableResetRowPattern(JsonTablePlanState *planstate, Datum item);
363362
static bool JsonTableFetchRow(TableFuncScanState *state);
364363
static Datum JsonTableGetValue(TableFuncScanState *state, int colnum,
365364
Oid typid, int32 typmod, bool *isnull);

‎src/bin/pg_combinebackup/copy_file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
static void copy_file_blocks(const char *src, const char *dst,
2626
pg_checksum_context *checksum_ctx);
2727

28-
static void copy_file_clone(const char *src, const char *dst,
28+
static void copy_file_clone(const char *src, const char *dest,
2929
pg_checksum_context *checksum_ctx);
3030

31-
static void copy_file_by_range(const char *src, const char *dst,
31+
static void copy_file_by_range(const char *src, const char *dest,
3232
pg_checksum_context *checksum_ctx);
3333

3434
#ifdef WIN32

0 commit comments

Comments
 (0)
0