Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6207f08

Browse files
Harmonize function parameter names for Postgres 17.
Make sure that function declarations use names that exactly match thecorresponding names from function definitions in a few places. Theseinconsistencies 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 mechanicallyapplying the same rules as similar clean-up commits (the earliest suchcommit was commit035ce1f).
1 parenta0fe90e commit6207f08

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
boolisconcurrent,intrequest);
230230
staticvoid_brin_end_parallel(BrinLeader*brinleader,BrinBuildState*state);
231231
staticSize_brin_parallel_estimate_shared(Relationheap,Snapshotsnapshot);
232-
staticdouble_brin_parallel_heapscan(BrinBuildState*buildstate);
233-
staticdouble_brin_parallel_merge(BrinBuildState*buildstate);
232+
staticdouble_brin_parallel_heapscan(BrinBuildState*state);
233+
staticdouble_brin_parallel_merge(BrinBuildState*state);
234234
staticvoid_brin_leader_participate_as_worker(BrinBuildState*buildstate,
235235
Relationheap,Relationindex);
236-
staticvoid_brin_parallel_scan_and_build(BrinBuildState*buildstate,
236+
staticvoid_brin_parallel_scan_and_build(BrinBuildState*state,
237237
BrinShared*brinshared,
238238
Sharedsort*sharedsort,
239239
Relationheap,Relationindex,

‎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
staticboollazy_vacuum_all_indexes(LVRelState*vacrel);
247247
staticvoidlazy_vacuum_heap_rel(LVRelState*vacrel);
248248
staticvoidlazy_vacuum_heap_page(LVRelState*vacrel,BlockNumberblkno,
249-
Bufferbuffer,OffsetNumber*offsets,
249+
Bufferbuffer,OffsetNumber*deadoffsets,
250250
intnum_offsets,Buffervmbuffer);
251251
staticboollazy_check_wraparound_failsafe(LVRelState*vacrel);
252252
staticvoidlazy_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
TimeLineIDtli,
142142
XLogRecPtrstart_lsn,
143143
XLogRecPtrend_lsn);
144-
staticvoidmanifest_report_error(JsonManifestParseContext*ib,
144+
staticvoidmanifest_report_error(JsonManifestParseContext*context,
145145
constchar*fmt,...)
146146
pg_attribute_printf(2,3)pg_attribute_noreturn();
147147
staticintcompare_block_numbers(constvoid*a,constvoid*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
staticvoidbbsink_zstd_begin_backup(bbsink*sink);
3636
staticvoidbbsink_zstd_begin_archive(bbsink*sink,constchar*archive_name);
37-
staticvoidbbsink_zstd_archive_contents(bbsink*sink,size_tavail_in);
37+
staticvoidbbsink_zstd_archive_contents(bbsink*sink,size_tlen);
3838
staticvoidbbsink_zstd_manifest_contents(bbsink*sink,size_tlen);
3939
staticvoidbbsink_zstd_end_archive(bbsink*sink);
4040
staticvoidbbsink_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, OidnewAccessMethod);
592+
static void ATExecSetAccessMethodNoStorage(Relation rel, OidnewAccessMethodId);
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
staticSpecialJoinInfo*build_child_join_sjinfo(PlannerInfo*root,
4646
SpecialJoinInfo*parent_sjinfo,
4747
Relidsleft_relids,Relidsright_relids);
48-
staticvoidfree_child_join_sjinfo(SpecialJoinInfo*child_sjinfo);
48+
staticvoidfree_child_join_sjinfo(SpecialJoinInfo*sjinfo);
4949
staticvoidcompute_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
staticNode*transformJsonObjectAgg(ParseState*pstate,JsonObjectAgg*agg);
8989
staticNode*transformJsonArrayAgg(ParseState*pstate,JsonArrayAgg*agg);
9090
staticNode*transformJsonIsPredicate(ParseState*pstate,JsonIsPredicate*pred);
91-
staticNode*transformJsonParseExpr(ParseState*pstate,JsonParseExpr*expr);
92-
staticNode*transformJsonScalarExpr(ParseState*pstate,JsonScalarExpr*expr);
91+
staticNode*transformJsonParseExpr(ParseState*pstate,JsonParseExpr*jsexpr);
92+
staticNode*transformJsonScalarExpr(ParseState*pstate,JsonScalarExpr*jsexpr);
9393
staticNode*transformJsonSerializeExpr(ParseState*pstate,
9494
JsonSerializeExpr*expr);
95-
staticNode*transformJsonFuncExpr(ParseState*pstate,JsonFuncExpr*p);
95+
staticNode*transformJsonFuncExpr(ParseState*pstate,JsonFuncExpr*func);
9696
staticvoidtransformJsonPassingArgs(ParseState*pstate,constchar*constructName,
9797
JsonFormatTypeformat,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
staticchar*libpqrcv_identify_system(WalReceiverConn*conn,
6161
TimeLineID*primary_tli);
62-
staticchar*libpqrcv_get_dbname_from_conninfo(constchar*conninfo);
62+
staticchar*libpqrcv_get_dbname_from_conninfo(constchar*connInfo);
6363
staticintlibpqrcv_server_version(WalReceiverConn*conn);
6464
staticvoidlibpqrcv_readtimelinehistoryfile(WalReceiverConn*conn,
6565
TimeLineIDtli,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
staticintcountVariablesFromJsonb(void*varsJsonb);
320320
staticJsonbValue*getJsonPathVariableFromJsonb(void*varsJsonb,char*varName,
321-
intvarNameLen,
321+
intvarNameLength,
322322
JsonbValue*baseObject,
323323
int*baseObjectId);
324324
staticintJsonbArraySize(JsonbValue*jb);
@@ -342,7 +342,6 @@ static void JsonValueListInitIterator(const JsonValueList *jvl,
342342
JsonValueListIterator*it);
343343
staticJsonbValue*JsonValueListNext(constJsonValueList*jvl,
344344
JsonValueListIterator*it);
345-
staticintJsonbType(JsonbValue*jb);
346345
staticJsonbValue*JsonbInitBinary(JsonbValue*jbv,Jsonb*jb);
347346
staticintJsonbType(JsonbValue*jb);
348347
staticJsonbValue*getScalar(JsonbValue*scalar,enumjbvTypetype);
@@ -359,7 +358,7 @@ static JsonTablePlanState *JsonTableInitPlan(JsonTableExecContext *cxt,
359358
List*args,
360359
MemoryContextmcxt);
361360
staticvoidJsonTableSetDocument(TableFuncScanState*state,Datumvalue);
362-
staticvoidJsonTableResetRowPattern(JsonTablePlanState*plan,Datumitem);
361+
staticvoidJsonTableResetRowPattern(JsonTablePlanState*planstate,Datumitem);
363362
staticboolJsonTableFetchRow(TableFuncScanState*state);
364363
staticDatumJsonTableGetValue(TableFuncScanState*state,intcolnum,
365364
Oidtypid,int32typmod,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
staticvoidcopy_file_blocks(constchar*src,constchar*dst,
2626
pg_checksum_context*checksum_ctx);
2727

28-
staticvoidcopy_file_clone(constchar*src,constchar*dst,
28+
staticvoidcopy_file_clone(constchar*src,constchar*dest,
2929
pg_checksum_context*checksum_ctx);
3030

31-
staticvoidcopy_file_by_range(constchar*src,constchar*dst,
31+
staticvoidcopy_file_by_range(constchar*src,constchar*dest,
3232
pg_checksum_context*checksum_ctx);
3333

3434
#ifdefWIN32

‎src/bin/pg_combinebackup/reconstruct.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static void write_reconstructed_file(char *input_filename,
6262
booldebug,
6363
booldry_run);
6464
staticvoidread_bytes(rfile*rf,void*buffer,unsignedlength);
65-
staticvoidwrite_block(intwfd,char*output_filename,
65+
staticvoidwrite_block(intfd,char*output_filename,
6666
uint8*buffer,
6767
pg_checksum_context*checksum_ctx);
6868
staticvoidread_block(rfile*s,off_toff,uint8*buffer);

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static PGresult *executeQuery(PGconn *conn, const char *query);
8080
staticvoidexecuteCommand(PGconn*conn,constchar*query);
8181
staticvoidexpand_dbname_patterns(PGconn*conn,SimpleStringList*patterns,
8282
SimpleStringList*names);
83-
staticvoidread_dumpall_filters(constchar*filename,SimpleStringList*patterns);
83+
staticvoidread_dumpall_filters(constchar*filename,SimpleStringList*pattern);
8484

8585
staticcharpg_dump_bin[MAXPGPATH];
8686
staticconstchar*progname;

‎src/bin/pg_dump/pg_restore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#include"pg_backup_utils.h"
5454

5555
staticvoidusage(constchar*progname);
56-
staticvoidread_restore_filters(constchar*filename,RestoreOptions*dopt);
56+
staticvoidread_restore_filters(constchar*filename,RestoreOptions*opts);
5757

5858
int
5959
main(intargc,char**argv)

‎src/include/access/heapam.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ extern void heap_page_prune_execute(Buffer buffer, bool lp_truncate_only,
382382
externvoidheap_get_root_tuples(Pagepage,OffsetNumber*root_offsets);
383383
externvoidlog_heap_prune_and_freeze(Relationrelation,Bufferbuffer,
384384
TransactionIdconflict_xid,
385-
boollp_truncate_only,
385+
boolcleanup_lock,
386386
PruneReasonreason,
387387
HeapTupleFreeze*frozen,intnfrozen,
388388
OffsetNumber*redirected,intnredirected,

‎src/include/common/unicode_case.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
typedefsize_t (*WordBoundaryNext) (void*wbstate);
2020

21-
pg_wcharunicode_lowercase_simple(pg_wcharucs);
22-
pg_wcharunicode_titlecase_simple(pg_wcharucs);
23-
pg_wcharunicode_uppercase_simple(pg_wcharucs);
21+
pg_wcharunicode_lowercase_simple(pg_wcharcode);
22+
pg_wcharunicode_titlecase_simple(pg_wcharcode);
23+
pg_wcharunicode_uppercase_simple(pg_wcharcode);
2424
size_tunicode_strlower(char*dst,size_tdstsize,constchar*src,
2525
ssize_tsrclen);
2626
size_tunicode_strtitle(char*dst,size_tdstsize,constchar*src,

‎src/include/common/unicode_category.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,31 @@ typedef enum pg_unicode_category
6161
PG_U_FINAL_PUNCTUATION=29/* Pf */
6262
}pg_unicode_category;
6363

64-
externpg_unicode_categoryunicode_category(pg_wcharucs);
64+
externpg_unicode_categoryunicode_category(pg_wcharcode);
6565
externconstchar*unicode_category_string(pg_unicode_categorycategory);
6666
externconstchar*unicode_category_abbrev(pg_unicode_categorycategory);
6767

68-
externboolpg_u_prop_alphabetic(pg_wcharc);
69-
externboolpg_u_prop_lowercase(pg_wcharc);
70-
externboolpg_u_prop_uppercase(pg_wcharc);
71-
externboolpg_u_prop_cased(pg_wcharc);
72-
externboolpg_u_prop_case_ignorable(pg_wcharc);
73-
externboolpg_u_prop_white_space(pg_wcharc);
74-
externboolpg_u_prop_hex_digit(pg_wcharc);
75-
externboolpg_u_prop_join_control(pg_wcharc);
68+
externboolpg_u_prop_alphabetic(pg_wcharcode);
69+
externboolpg_u_prop_lowercase(pg_wcharcode);
70+
externboolpg_u_prop_uppercase(pg_wcharcode);
71+
externboolpg_u_prop_cased(pg_wcharcode);
72+
externboolpg_u_prop_case_ignorable(pg_wcharcode);
73+
externboolpg_u_prop_white_space(pg_wcharcode);
74+
externboolpg_u_prop_hex_digit(pg_wcharcode);
75+
externboolpg_u_prop_join_control(pg_wcharcode);
7676

77-
externboolpg_u_isdigit(pg_wcharc,boolposix);
78-
externboolpg_u_isalpha(pg_wcharc);
79-
externboolpg_u_isalnum(pg_wcharc,boolposix);
80-
externboolpg_u_isword(pg_wcharc);
81-
externboolpg_u_isupper(pg_wcharc);
82-
externboolpg_u_islower(pg_wcharc);
83-
externboolpg_u_isblank(pg_wcharc);
84-
externboolpg_u_iscntrl(pg_wcharc);
85-
externboolpg_u_isgraph(pg_wcharc);
86-
externboolpg_u_isprint(pg_wcharc);
87-
externboolpg_u_ispunct(pg_wcharc,boolposix);
88-
externboolpg_u_isspace(pg_wcharc);
89-
externboolpg_u_isxdigit(pg_wcharc,boolposix);
77+
externboolpg_u_isdigit(pg_wcharcode,boolposix);
78+
externboolpg_u_isalpha(pg_wcharcode);
79+
externboolpg_u_isalnum(pg_wcharcode,boolposix);
80+
externboolpg_u_isword(pg_wcharcode);
81+
externboolpg_u_isupper(pg_wcharcode);
82+
externboolpg_u_islower(pg_wcharcode);
83+
externboolpg_u_isblank(pg_wcharcode);
84+
externboolpg_u_iscntrl(pg_wcharcode);
85+
externboolpg_u_isgraph(pg_wcharcode);
86+
externboolpg_u_isprint(pg_wcharcode);
87+
externboolpg_u_ispunct(pg_wcharcode,boolposix);
88+
externboolpg_u_isspace(pg_wcharcode);
89+
externboolpg_u_isxdigit(pg_wcharcode,boolposix);
9090

9191
#endif/* UNICODE_CATEGORY_H */

‎src/include/libpq/libpq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ extern PGDLLIMPORT WaitEventSet *FeBeWaitSet;
6666

6767
externintListenServerPort(intfamily,constchar*hostName,
6868
unsigned shortportNumber,constchar*unixSocketDir,
69-
pgsocketListenSocket[],int*NumListenSockets,intMaxListen);
69+
pgsocketListenSockets[],int*NumListenSockets,intMaxListen);
7070
externintAcceptConnection(pgsocketserver_fd,ClientSocket*client_sock);
7171
externvoidTouchSocketFiles(void);
7272
externvoidRemoveSocketFiles(void);

‎src/include/postmaster/postmaster.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ extern void pgwin32_register_deadchild_callback(HANDLE procHandle, DWORD procId)
7777
externPGDLLIMPORTstructClientSocket*MyClientSocket;
7878

7979
/* prototypes for functions in launch_backend.c */
80-
externpid_tpostmaster_child_launch(BackendTypechild_type,char*startup_data,size_tstartup_data_len,structClientSocket*sock);
80+
externpid_tpostmaster_child_launch(BackendTypechild_type,
81+
char*startup_data,
82+
size_tstartup_data_len,
83+
structClientSocket*client_sock);
8184
constchar*PostmasterChildName(BackendTypechild_type);
8285
#ifdefEXEC_BACKEND
8386
externvoidSubPostmasterMain(intargc,char*argv[])pg_attribute_noreturn();

‎src/include/storage/bufmgr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ extern bool StartReadBuffer(ReadBuffersOperation *operation,
220220
intflags);
221221
externboolStartReadBuffers(ReadBuffersOperation*operation,
222222
Buffer*buffers,
223-
BlockNumberblocknum,
223+
BlockNumberblockNum,
224224
int*nblocks,
225225
intflags);
226226
externvoidWaitReadBuffers(ReadBuffersOperation*operation);

‎src/include/storage/fd.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ extern File PathNameOpenFilePerm(const char *fileName, int fileFlags, mode_t fil
107107
externFileOpenTemporaryFile(boolinterXact);
108108
externvoidFileClose(Filefile);
109109
externintFilePrefetch(Filefile,off_toffset,off_tamount,uint32wait_event_info);
110-
externssize_tFileReadV(Filefile,conststructiovec*ioc,intiovcnt,off_toffset,uint32wait_event_info);
111-
externssize_tFileWriteV(Filefile,conststructiovec*ioc,intiovcnt,off_toffset,uint32wait_event_info);
110+
externssize_tFileReadV(Filefile,conststructiovec*iov,intiovcnt,off_toffset,uint32wait_event_info);
111+
externssize_tFileWriteV(Filefile,conststructiovec*iov,intiovcnt,off_toffset,uint32wait_event_info);
112112
externintFileSync(Filefile,uint32wait_event_info);
113113
externintFileZero(Filefile,off_toffset,off_tamount,uint32wait_event_info);
114114
externintFileFallocate(Filefile,off_toffset,off_tamount,uint32wait_event_info);
@@ -182,7 +182,7 @@ extern intpg_fsync(int fd);
182182
externintpg_fsync_no_writethrough(intfd);
183183
externintpg_fsync_writethrough(intfd);
184184
externintpg_fdatasync(intfd);
185-
externboolpg_file_exists(constchar*fname);
185+
externboolpg_file_exists(constchar*name);
186186
externvoidpg_flush_data(intfd,off_toffset,off_tnbytes);
187187
externintpg_truncate(constchar*path,off_tlength);
188188
externvoidfsync_fname(constchar*fname,boolisdir);

‎src/include/storage/read_stream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extern ReadStream *read_stream_begin_relation(int flags,
5656
ReadStreamBlockNumberCBcallback,
5757
void*callback_private_data,
5858
size_tper_buffer_data_size);
59-
externBufferread_stream_next_buffer(ReadStream*stream,void**per_buffer_private);
59+
externBufferread_stream_next_buffer(ReadStream*stream,void**per_buffer_data);
6060
externvoidread_stream_reset(ReadStream*stream);
6161
externvoidread_stream_end(ReadStream*stream);
6262

‎src/include/storage/smgr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ extern bool smgrprefetch(SMgrRelation reln, ForkNumber forknum,
9494
BlockNumberblocknum,intnblocks);
9595
externvoidsmgrreadv(SMgrRelationreln,ForkNumberforknum,
9696
BlockNumberblocknum,
97-
void**buffer,BlockNumbernblocks);
97+
void**buffers,BlockNumbernblocks);
9898
externvoidsmgrwritev(SMgrRelationreln,ForkNumberforknum,
9999
BlockNumberblocknum,
100-
constvoid**buffer,BlockNumbernblocks,
100+
constvoid**buffers,BlockNumbernblocks,
101101
boolskipFsync);
102102
externvoidsmgrwriteback(SMgrRelationreln,ForkNumberforknum,
103103
BlockNumberblocknum,BlockNumbernblocks);

‎src/include/utils/guc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ extern void AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt);
402402
externchar*GetConfigOptionByName(constchar*name,constchar**varname,
403403
boolmissing_ok);
404404

405-
externvoidTransformGUCArray(ArrayType*array,List**configNames,
406-
List**configValues);
405+
externvoidTransformGUCArray(ArrayType*array,List**names,
406+
List**values);
407407
externvoidProcessGUCArray(ArrayType*array,
408408
GucContextcontext,GucSourcesource,GucActionaction);
409409
externArrayType*GUCArrayAdd(ArrayType*array,constchar*name,constchar*value);

‎src/include/utils/jsonpath.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ typedef struct JsonPathVariable
295295

296296

297297
/* SQL/JSON query functions */
298-
externboolJsonPathExists(Datumjb,JsonPath*path,bool*error,List*vars);
298+
externboolJsonPathExists(Datumjb,JsonPath*jp,bool*error,List*vars);
299299
externDatumJsonPathQuery(Datumjb,JsonPath*jp,JsonWrapperwrapper,
300300
bool*empty,bool*error,List*vars,
301301
constchar*column_name);

‎src/include/utils/pg_locale.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ extern size_t pg_strxfrm_prefix(char *dest, const char *src, size_t destsize,
117117
externsize_tpg_strnxfrm_prefix(char*dest,size_tdestsize,constchar*src,
118118
size_tsrclen,pg_locale_tlocale);
119119

120-
externintbuiltin_locale_encoding(constchar*loc_str);
121-
externconstchar*builtin_validate_locale(intencoding,constchar*loc_str);
120+
externintbuiltin_locale_encoding(constchar*locale);
121+
externconstchar*builtin_validate_locale(intencoding,constchar*locale);
122122
externvoidicu_validate_locale(constchar*loc_str);
123123
externchar*icu_language_tag(constchar*loc_str,intelevel);
124124

‎src/include/utils/resowner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ extern void ResourceOwnerNewParent(ResourceOwner owner,
146146
ResourceOwnernewparent);
147147

148148
externvoidResourceOwnerEnlarge(ResourceOwnerowner);
149-
externvoidResourceOwnerRemember(ResourceOwnerowner,Datumres,constResourceOwnerDesc*kind);
150-
externvoidResourceOwnerForget(ResourceOwnerowner,Datumres,constResourceOwnerDesc*kind);
149+
externvoidResourceOwnerRemember(ResourceOwnerowner,Datumvalue,constResourceOwnerDesc*kind);
150+
externvoidResourceOwnerForget(ResourceOwnerowner,Datumvalue,constResourceOwnerDesc*kind);
151151

152152
externvoidResourceOwnerReleaseAllOfKind(ResourceOwnerowner,constResourceOwnerDesc*kind);
153153

‎src/include/utils/tuplesort.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ extern void tuplesort_putheaptuple(Tuplesortstate *state, HeapTuple tup);
455455
externvoidtuplesort_putindextuplevalues(Tuplesortstate*state,
456456
Relationrel,ItemPointerself,
457457
constDatum*values,constbool*isnull);
458-
externvoidtuplesort_putbrintuple(Tuplesortstate*state,BrinTuple*tup,Sizelen);
458+
externvoidtuplesort_putbrintuple(Tuplesortstate*state,BrinTuple*tuple,Sizesize);
459459
externvoidtuplesort_putdatum(Tuplesortstate*state,Datumval,
460460
boolisNull);
461461

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp