summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/access/heapam.h2
-rw-r--r--src/include/common/unicode_case.h6
-rw-r--r--src/include/common/unicode_category.h44
-rw-r--r--src/include/libpq/libpq.h2
-rw-r--r--src/include/postmaster/postmaster.h5
-rw-r--r--src/include/storage/bufmgr.h2
-rw-r--r--src/include/storage/fd.h6
-rw-r--r--src/include/storage/read_stream.h2
-rw-r--r--src/include/storage/smgr.h4
-rw-r--r--src/include/utils/guc.h4
-rw-r--r--src/include/utils/jsonpath.h2
-rw-r--r--src/include/utils/pg_locale.h4
-rw-r--r--src/include/utils/resowner.h4
-rw-r--r--src/include/utils/tuplesort.h2
14 files changed, 46 insertions, 43 deletions
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);