diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index d0f3848c952..6467bed604a 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -229,11 +229,11 @@ static void _brin_begin_parallel(BrinBuildState *buildstate, Relation heap, Rela bool isconcurrent, int request); static void _brin_end_parallel(BrinLeader *brinleader, BrinBuildState *state); static Size _brin_parallel_estimate_shared(Relation heap, Snapshot snapshot); -static double _brin_parallel_heapscan(BrinBuildState *buildstate); -static double _brin_parallel_merge(BrinBuildState *buildstate); +static double _brin_parallel_heapscan(BrinBuildState *state); +static double _brin_parallel_merge(BrinBuildState *state); static void _brin_leader_participate_as_worker(BrinBuildState *buildstate, Relation heap, Relation index); -static void _brin_parallel_scan_and_build(BrinBuildState *buildstate, +static void _brin_parallel_scan_and_build(BrinBuildState *state, BrinShared *brinshared, Sharedsort *sharedsort, Relation heap, Relation index, diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 8145ea8fc3f..70426b0266e 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -246,7 +246,7 @@ static void lazy_vacuum(LVRelState *vacrel); static bool lazy_vacuum_all_indexes(LVRelState *vacrel); static void lazy_vacuum_heap_rel(LVRelState *vacrel); static void lazy_vacuum_heap_page(LVRelState *vacrel, BlockNumber blkno, - Buffer buffer, OffsetNumber *offsets, + Buffer buffer, OffsetNumber *deadoffsets, int num_offsets, Buffer vmbuffer); static bool lazy_check_wraparound_failsafe(LVRelState *vacrel); static void lazy_cleanup_all_indexes(LVRelState *vacrel); diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c index 4ad9d7cad00..b6cfeb6926a 100644 --- a/src/backend/backup/basebackup_incremental.c +++ b/src/backend/backup/basebackup_incremental.c @@ -141,7 +141,7 @@ static void manifest_process_wal_range(JsonManifestParseContext *context, TimeLineID tli, XLogRecPtr start_lsn, XLogRecPtr end_lsn); -static void manifest_report_error(JsonManifestParseContext *ib, +static void manifest_report_error(JsonManifestParseContext *context, const char *fmt,...) pg_attribute_printf(2, 3) pg_attribute_noreturn(); static int compare_block_numbers(const void *a, const void *b); diff --git a/src/backend/backup/basebackup_zstd.c b/src/backend/backup/basebackup_zstd.c index 6741fcaf96d..0989e92e3c2 100644 --- a/src/backend/backup/basebackup_zstd.c +++ b/src/backend/backup/basebackup_zstd.c @@ -34,7 +34,7 @@ typedef struct bbsink_zstd static void bbsink_zstd_begin_backup(bbsink *sink); static void bbsink_zstd_begin_archive(bbsink *sink, const char *archive_name); -static void bbsink_zstd_archive_contents(bbsink *sink, size_t avail_in); +static void bbsink_zstd_archive_contents(bbsink *sink, size_t len); static void bbsink_zstd_manifest_contents(bbsink *sink, size_t len); static void bbsink_zstd_end_archive(bbsink *sink); static void bbsink_zstd_cleanup(bbsink *sink); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 6adfd876140..66cda26a25f 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -589,7 +589,7 @@ static ObjectAddress ATExecClusterOn(Relation rel, const char *indexName, LOCKMODE lockmode); static void ATExecDropCluster(Relation rel, LOCKMODE lockmode); static void ATPrepSetAccessMethod(AlteredTableInfo *tab, Relation rel, const char *amname); -static void ATExecSetAccessMethodNoStorage(Relation rel, Oid newAccessMethod); +static void ATExecSetAccessMethodNoStorage(Relation rel, Oid newAccessMethodId); static bool ATPrepChangePersistence(Relation rel, bool toLogged); static void ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, const char *tablespacename, LOCKMODE lockmode); diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c index f3a9412d18a..db475e25b15 100644 --- a/src/backend/optimizer/path/joinrels.c +++ b/src/backend/optimizer/path/joinrels.c @@ -45,7 +45,7 @@ static void try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, static SpecialJoinInfo *build_child_join_sjinfo(PlannerInfo *root, SpecialJoinInfo *parent_sjinfo, Relids left_relids, Relids right_relids); -static void free_child_join_sjinfo(SpecialJoinInfo *child_sjinfo); +static void free_child_join_sjinfo(SpecialJoinInfo *sjinfo); static void compute_partition_bounds(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2, RelOptInfo *joinrel, SpecialJoinInfo *parent_sjinfo, diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index aba3546ed1a..4c95986c312 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -88,11 +88,11 @@ static Node *transformJsonArrayQueryConstructor(ParseState *pstate, static Node *transformJsonObjectAgg(ParseState *pstate, JsonObjectAgg *agg); static Node *transformJsonArrayAgg(ParseState *pstate, JsonArrayAgg *agg); static Node *transformJsonIsPredicate(ParseState *pstate, JsonIsPredicate *pred); -static Node *transformJsonParseExpr(ParseState *pstate, JsonParseExpr *expr); -static Node *transformJsonScalarExpr(ParseState *pstate, JsonScalarExpr *expr); +static Node *transformJsonParseExpr(ParseState *pstate, JsonParseExpr *jsexpr); +static Node *transformJsonScalarExpr(ParseState *pstate, JsonScalarExpr *jsexpr); static Node *transformJsonSerializeExpr(ParseState *pstate, JsonSerializeExpr *expr); -static Node *transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *p); +static Node *transformJsonFuncExpr(ParseState *pstate, JsonFuncExpr *func); static void transformJsonPassingArgs(ParseState *pstate, const char *constructName, JsonFormatType format, List *args, List **passing_values, List **passing_names); diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index 3c2b1bb4966..02f12f29219 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -59,7 +59,7 @@ static void libpqrcv_get_senderinfo(WalReceiverConn *conn, char **sender_host, int *sender_port); static char *libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli); -static char *libpqrcv_get_dbname_from_conninfo(const char *conninfo); +static char *libpqrcv_get_dbname_from_conninfo(const char *connInfo); static int libpqrcv_server_version(WalReceiverConn *conn); static void libpqrcv_readtimelinehistoryfile(WalReceiverConn *conn, TimeLineID tli, char **filename, diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index 8a0a2dbc850..ceb30033e1c 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -318,7 +318,7 @@ static void getJsonPathVariable(JsonPathExecContext *cxt, JsonPathItem *variable, JsonbValue *value); static int countVariablesFromJsonb(void *varsJsonb); static JsonbValue *getJsonPathVariableFromJsonb(void *varsJsonb, char *varName, - int varNameLen, + int varNameLength, JsonbValue *baseObject, int *baseObjectId); static int JsonbArraySize(JsonbValue *jb); @@ -342,7 +342,6 @@ static void JsonValueListInitIterator(const JsonValueList *jvl, JsonValueListIterator *it); static JsonbValue *JsonValueListNext(const JsonValueList *jvl, JsonValueListIterator *it); -static int JsonbType(JsonbValue *jb); static JsonbValue *JsonbInitBinary(JsonbValue *jbv, Jsonb *jb); static int JsonbType(JsonbValue *jb); static JsonbValue *getScalar(JsonbValue *scalar, enum jbvType type); @@ -359,7 +358,7 @@ static JsonTablePlanState *JsonTableInitPlan(JsonTableExecContext *cxt, List *args, MemoryContext mcxt); static void JsonTableSetDocument(TableFuncScanState *state, Datum value); -static void JsonTableResetRowPattern(JsonTablePlanState *plan, Datum item); +static void JsonTableResetRowPattern(JsonTablePlanState *planstate, Datum item); static bool JsonTableFetchRow(TableFuncScanState *state); static Datum JsonTableGetValue(TableFuncScanState *state, int colnum, Oid typid, int32 typmod, bool *isnull); diff --git a/src/bin/pg_combinebackup/copy_file.c b/src/bin/pg_combinebackup/copy_file.c index b00266cde54..08c3b875420 100644 --- a/src/bin/pg_combinebackup/copy_file.c +++ b/src/bin/pg_combinebackup/copy_file.c @@ -25,10 +25,10 @@ static void copy_file_blocks(const char *src, const char *dst, pg_checksum_context *checksum_ctx); -static void copy_file_clone(const char *src, const char *dst, +static void copy_file_clone(const char *src, const char *dest, pg_checksum_context *checksum_ctx); -static void copy_file_by_range(const char *src, const char *dst, +static void copy_file_by_range(const char *src, const char *dest, pg_checksum_context *checksum_ctx); #ifdef WIN32 diff --git a/src/bin/pg_combinebackup/reconstruct.c b/src/bin/pg_combinebackup/reconstruct.c index c584c63e5d5..4c03da77fba 100644 --- a/src/bin/pg_combinebackup/reconstruct.c +++ b/src/bin/pg_combinebackup/reconstruct.c @@ -62,7 +62,7 @@ static void write_reconstructed_file(char *input_filename, bool debug, bool dry_run); static void read_bytes(rfile *rf, void *buffer, unsigned length); -static void write_block(int wfd, char *output_filename, +static void write_block(int fd, char *output_filename, uint8 *buffer, pg_checksum_context *checksum_ctx); static void read_block(rfile *s, off_t off, uint8 *buffer); diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 73337f33923..882dbf8e865 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -80,7 +80,7 @@ static PGresult *executeQuery(PGconn *conn, const char *query); static void executeCommand(PGconn *conn, const char *query); static void expand_dbname_patterns(PGconn *conn, SimpleStringList *patterns, SimpleStringList *names); -static void read_dumpall_filters(const char *filename, SimpleStringList *patterns); +static void read_dumpall_filters(const char *filename, SimpleStringList *pattern); static char pg_dump_bin[MAXPGPATH]; static const char *progname; diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index 5ea78cf7cc0..df119591cca 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -53,7 +53,7 @@ #include "pg_backup_utils.h" static void usage(const char *progname); -static void read_restore_filters(const char *filename, RestoreOptions *dopt); +static void read_restore_filters(const char *filename, RestoreOptions *opts); int main(int argc, char **argv) diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index c47a5045cef..9e9aec88a62 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -382,7 +382,7 @@ extern void heap_page_prune_execute(Buffer buffer, bool lp_truncate_only, extern void heap_get_root_tuples(Page page, OffsetNumber *root_offsets); extern void log_heap_prune_and_freeze(Relation relation, Buffer buffer, TransactionId conflict_xid, - bool lp_truncate_only, + bool cleanup_lock, PruneReason reason, HeapTupleFreeze *frozen, int nfrozen, OffsetNumber *redirected, int nredirected, diff --git a/src/include/common/unicode_case.h b/src/include/common/unicode_case.h index c1c2d4c5762..5a65c12d453 100644 --- a/src/include/common/unicode_case.h +++ b/src/include/common/unicode_case.h @@ -18,9 +18,9 @@ typedef size_t (*WordBoundaryNext) (void *wbstate); -pg_wchar unicode_lowercase_simple(pg_wchar ucs); -pg_wchar unicode_titlecase_simple(pg_wchar ucs); -pg_wchar unicode_uppercase_simple(pg_wchar ucs); +pg_wchar unicode_lowercase_simple(pg_wchar code); +pg_wchar unicode_titlecase_simple(pg_wchar code); +pg_wchar unicode_uppercase_simple(pg_wchar code); size_t unicode_strlower(char *dst, size_t dstsize, const char *src, ssize_t srclen); size_t unicode_strtitle(char *dst, size_t dstsize, const char *src, diff --git a/src/include/common/unicode_category.h b/src/include/common/unicode_category.h index f185b589009..a68f9eb8c89 100644 --- a/src/include/common/unicode_category.h +++ b/src/include/common/unicode_category.h @@ -61,31 +61,31 @@ typedef enum pg_unicode_category PG_U_FINAL_PUNCTUATION = 29 /* Pf */ } pg_unicode_category; -extern pg_unicode_category unicode_category(pg_wchar ucs); +extern pg_unicode_category unicode_category(pg_wchar code); extern const char *unicode_category_string(pg_unicode_category category); extern const char *unicode_category_abbrev(pg_unicode_category category); -extern bool pg_u_prop_alphabetic(pg_wchar c); -extern bool pg_u_prop_lowercase(pg_wchar c); -extern bool pg_u_prop_uppercase(pg_wchar c); -extern bool pg_u_prop_cased(pg_wchar c); -extern bool pg_u_prop_case_ignorable(pg_wchar c); -extern bool pg_u_prop_white_space(pg_wchar c); -extern bool pg_u_prop_hex_digit(pg_wchar c); -extern bool pg_u_prop_join_control(pg_wchar c); +extern bool pg_u_prop_alphabetic(pg_wchar code); +extern bool pg_u_prop_lowercase(pg_wchar code); +extern bool pg_u_prop_uppercase(pg_wchar code); +extern bool pg_u_prop_cased(pg_wchar code); +extern bool pg_u_prop_case_ignorable(pg_wchar code); +extern bool pg_u_prop_white_space(pg_wchar code); +extern bool pg_u_prop_hex_digit(pg_wchar code); +extern bool pg_u_prop_join_control(pg_wchar code); -extern bool pg_u_isdigit(pg_wchar c, bool posix); -extern bool pg_u_isalpha(pg_wchar c); -extern bool pg_u_isalnum(pg_wchar c, bool posix); -extern bool pg_u_isword(pg_wchar c); -extern bool pg_u_isupper(pg_wchar c); -extern bool pg_u_islower(pg_wchar c); -extern bool pg_u_isblank(pg_wchar c); -extern bool pg_u_iscntrl(pg_wchar c); -extern bool pg_u_isgraph(pg_wchar c); -extern bool pg_u_isprint(pg_wchar c); -extern bool pg_u_ispunct(pg_wchar c, bool posix); -extern bool pg_u_isspace(pg_wchar c); -extern bool pg_u_isxdigit(pg_wchar c, bool posix); +extern bool pg_u_isdigit(pg_wchar code, bool posix); +extern bool pg_u_isalpha(pg_wchar code); +extern bool pg_u_isalnum(pg_wchar code, bool posix); +extern bool pg_u_isword(pg_wchar code); +extern bool pg_u_isupper(pg_wchar code); +extern bool pg_u_islower(pg_wchar code); +extern bool pg_u_isblank(pg_wchar code); +extern bool pg_u_iscntrl(pg_wchar code); +extern bool pg_u_isgraph(pg_wchar code); +extern bool pg_u_isprint(pg_wchar code); +extern bool pg_u_ispunct(pg_wchar code, bool posix); +extern bool pg_u_isspace(pg_wchar code); +extern bool pg_u_isxdigit(pg_wchar code, bool posix); #endif /* UNICODE_CATEGORY_H */ diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index 83e338f604a..142c98462ed 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -66,7 +66,7 @@ extern PGDLLIMPORT WaitEventSet *FeBeWaitSet; extern int ListenServerPort(int family, const char *hostName, unsigned short portNumber, const char *unixSocketDir, - pgsocket ListenSocket[], int *NumListenSockets, int MaxListen); + pgsocket ListenSockets[], int *NumListenSockets, int MaxListen); extern int AcceptConnection(pgsocket server_fd, ClientSocket *client_sock); extern void TouchSocketFiles(void); extern void RemoveSocketFiles(void); diff --git a/src/include/postmaster/postmaster.h b/src/include/postmaster/postmaster.h index f6152eddf58..89ad13b788b 100644 --- a/src/include/postmaster/postmaster.h +++ b/src/include/postmaster/postmaster.h @@ -77,7 +77,10 @@ extern void pgwin32_register_deadchild_callback(HANDLE procHandle, DWORD procId) extern PGDLLIMPORT struct ClientSocket *MyClientSocket; /* prototypes for functions in launch_backend.c */ -extern pid_t postmaster_child_launch(BackendType child_type, char *startup_data, size_t startup_data_len, struct ClientSocket *sock); +extern pid_t postmaster_child_launch(BackendType child_type, + char *startup_data, + size_t startup_data_len, + struct ClientSocket *client_sock); const char *PostmasterChildName(BackendType child_type); #ifdef EXEC_BACKEND extern void SubPostmasterMain(int argc, char *argv[]) pg_attribute_noreturn(); diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 08364447c74..a1e71013d32 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -220,7 +220,7 @@ extern bool StartReadBuffer(ReadBuffersOperation *operation, int flags); extern bool StartReadBuffers(ReadBuffersOperation *operation, Buffer *buffers, - BlockNumber blocknum, + BlockNumber blockNum, int *nblocks, int flags); extern void WaitReadBuffers(ReadBuffersOperation *operation); diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index a173174db97..1456ab383a4 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -107,8 +107,8 @@ extern File PathNameOpenFilePerm(const char *fileName, int fileFlags, mode_t fil extern File OpenTemporaryFile(bool interXact); extern void FileClose(File file); extern int FilePrefetch(File file, off_t offset, off_t amount, uint32 wait_event_info); -extern ssize_t FileReadV(File file, const struct iovec *ioc, int iovcnt, off_t offset, uint32 wait_event_info); -extern ssize_t FileWriteV(File file, const struct iovec *ioc, int iovcnt, off_t offset, uint32 wait_event_info); +extern ssize_t FileReadV(File file, const struct iovec *iov, int iovcnt, off_t offset, uint32 wait_event_info); +extern ssize_t FileWriteV(File file, const struct iovec *iov, int iovcnt, off_t offset, uint32 wait_event_info); extern int FileSync(File file, uint32 wait_event_info); extern int FileZero(File file, off_t offset, off_t amount, uint32 wait_event_info); extern int FileFallocate(File file, off_t offset, off_t amount, uint32 wait_event_info); @@ -182,7 +182,7 @@ extern int pg_fsync(int fd); extern int pg_fsync_no_writethrough(int fd); extern int pg_fsync_writethrough(int fd); extern int pg_fdatasync(int fd); -extern bool pg_file_exists(const char *fname); +extern bool pg_file_exists(const char *name); extern void pg_flush_data(int fd, off_t offset, off_t nbytes); extern int pg_truncate(const char *path, off_t length); extern void fsync_fname(const char *fname, bool isdir); diff --git a/src/include/storage/read_stream.h b/src/include/storage/read_stream.h index fae09d2b4cc..f676d2cc20a 100644 --- a/src/include/storage/read_stream.h +++ b/src/include/storage/read_stream.h @@ -56,7 +56,7 @@ extern ReadStream *read_stream_begin_relation(int flags, ReadStreamBlockNumberCB callback, void *callback_private_data, size_t per_buffer_data_size); -extern Buffer read_stream_next_buffer(ReadStream *stream, void **per_buffer_private); +extern Buffer read_stream_next_buffer(ReadStream *stream, void **per_buffer_data); extern void read_stream_reset(ReadStream *stream); extern void read_stream_end(ReadStream *stream); diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index fc5f883ce14..e15b20a566a 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -94,10 +94,10 @@ extern bool smgrprefetch(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, int nblocks); extern void smgrreadv(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, - void **buffer, BlockNumber nblocks); + void **buffers, BlockNumber nblocks); extern void smgrwritev(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, - const void **buffer, BlockNumber nblocks, + const void **buffers, BlockNumber nblocks, bool skipFsync); extern void smgrwriteback(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, BlockNumber nblocks); diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index e4a594b5e80..ff506bf48d9 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -402,8 +402,8 @@ extern void AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt); extern char *GetConfigOptionByName(const char *name, const char **varname, bool missing_ok); -extern void TransformGUCArray(ArrayType *array, List **configNames, - List **configValues); +extern void TransformGUCArray(ArrayType *array, List **names, + List **values); extern void ProcessGUCArray(ArrayType *array, GucContext context, GucSource source, GucAction action); extern ArrayType *GUCArrayAdd(ArrayType *array, const char *name, const char *value); diff --git a/src/include/utils/jsonpath.h b/src/include/utils/jsonpath.h index 69c180c2e29..9d2b8533d54 100644 --- a/src/include/utils/jsonpath.h +++ b/src/include/utils/jsonpath.h @@ -295,7 +295,7 @@ typedef struct JsonPathVariable /* SQL/JSON query functions */ -extern bool JsonPathExists(Datum jb, JsonPath *path, bool *error, List *vars); +extern bool JsonPathExists(Datum jb, JsonPath *jp, bool *error, List *vars); extern Datum JsonPathQuery(Datum jb, JsonPath *jp, JsonWrapper wrapper, bool *empty, bool *error, List *vars, const char *column_name); diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index 205aa200672..040968d6ff2 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -117,8 +117,8 @@ extern size_t pg_strxfrm_prefix(char *dest, const char *src, size_t destsize, extern size_t pg_strnxfrm_prefix(char *dest, size_t destsize, const char *src, size_t srclen, pg_locale_t locale); -extern int builtin_locale_encoding(const char *loc_str); -extern const char *builtin_validate_locale(int encoding, const char *loc_str); +extern int builtin_locale_encoding(const char *locale); +extern const char *builtin_validate_locale(int encoding, const char *locale); extern void icu_validate_locale(const char *loc_str); extern char *icu_language_tag(const char *loc_str, int elevel); diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h index 68eba1822b3..4e534bc3e70 100644 --- a/src/include/utils/resowner.h +++ b/src/include/utils/resowner.h @@ -146,8 +146,8 @@ extern void ResourceOwnerNewParent(ResourceOwner owner, ResourceOwner newparent); extern void ResourceOwnerEnlarge(ResourceOwner owner); -extern void ResourceOwnerRemember(ResourceOwner owner, Datum res, const ResourceOwnerDesc *kind); -extern void ResourceOwnerForget(ResourceOwner owner, Datum res, const ResourceOwnerDesc *kind); +extern void ResourceOwnerRemember(ResourceOwner owner, Datum value, const ResourceOwnerDesc *kind); +extern void ResourceOwnerForget(ResourceOwner owner, Datum value, const ResourceOwnerDesc *kind); extern void ResourceOwnerReleaseAllOfKind(ResourceOwner owner, const ResourceOwnerDesc *kind); diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index e7941a1f09f..cde83f62015 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -455,7 +455,7 @@ extern void tuplesort_putheaptuple(Tuplesortstate *state, HeapTuple tup); extern void tuplesort_putindextuplevalues(Tuplesortstate *state, Relation rel, ItemPointer self, const Datum *values, const bool *isnull); -extern void tuplesort_putbrintuple(Tuplesortstate *state, BrinTuple *tup, Size len); +extern void tuplesort_putbrintuple(Tuplesortstate *state, BrinTuple *tuple, Size size); extern void tuplesort_putdatum(Tuplesortstate *state, Datum val, bool isNull);