Harmonize function parameter names for Postgres 18.

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 18 development.

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 035ce1fe).

diff --git a/contrib/pg_overexplain/pg_overexplain.c b/contrib/pg_overexplain/pg_overexplain.c
index 68c40fc98ea5b7135efe8fcadba426cf14a769a9..f60049f4ba6bbcc91b4c0156f9b3ffaa4a2ae845 100644 (file)
--- a/contrib/pg_overexplain/pg_overexplain.c
+++ b/contrib/pg_overexplain/pg_overexplain.c
@@ -54,7 +54,7 @@ static void overexplain_alias(const char *qlabel, Alias *alias,
                              ExplainState *es);
 static void overexplain_bitmapset(const char *qlabel, Bitmapset *bms,
                                  ExplainState *es);
-static void overexplain_intlist(const char *qlabel, List *intlist,
+static void overexplain_intlist(const char *qlabel, List *list,
                                ExplainState *es);
 
 static int es_extension_id;

diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index a7e0cc9f3236a1f956c7a2409fe1a0368ab35f26..331f3fc088d1bc582bbab3664915768b3e173e70 100644 (file)
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -444,7 +444,7 @@ static void adjust_foreign_grouping_path_cost(PlannerInfo *root,
                                              double retrieved_rows,
                                              double width,
                                              double limit_tuples,
-                                             int *disabled_nodes,
+                                             int *p_disabled_nodes,
                                              Cost *p_startup_cost,
                                              Cost *p_run_cost);
 static bool ec_member_matches_foreign(PlannerInfo *root, RelOptInfo *rel,

diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index e25d817c1955c26ac1829033a092a23555b40b8e..cfab93ec30cec48bb5e48cd6701d8177366c73c7 100644 (file)
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -180,11 +180,11 @@ static void _gin_begin_parallel(GinBuildState *buildstate, Relation heap, Relati
                                bool isconcurrent, int request);
 static void _gin_end_parallel(GinLeader *ginleader, GinBuildState *state);
 static Size _gin_parallel_estimate_shared(Relation heap, Snapshot snapshot);
-static double _gin_parallel_heapscan(GinBuildState *buildstate);
-static double _gin_parallel_merge(GinBuildState *buildstate);
+static double _gin_parallel_heapscan(GinBuildState *state);
+static double _gin_parallel_merge(GinBuildState *state);
 static void _gin_leader_participate_as_worker(GinBuildState *buildstate,
                                              Relation heap, Relation index);
-static void _gin_parallel_scan_and_build(GinBuildState *buildstate,
+static void _gin_parallel_scan_and_build(GinBuildState *state,
                                         GinBuildShared *ginshared,
                                         Sharedsort *sharedsort,
                                         Relation heap, Relation index,

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 686f1850cab83ea54b36be0eb89623f92ed2ef01..b3ed69457fc7b0e18c293843d4cc82f4eb8fc5ce 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -397,7 +397,7 @@ static bool ATExecAlterConstraintInternal(List **wqueue, ATAlterConstraint *cmdc
                                          bool recurse, LOCKMODE lockmode);
 static bool ATExecAlterConstrEnforceability(List **wqueue, ATAlterConstraint *cmdcon,
                                            Relation conrel, Relation tgrel,
-                                           const Oid fkrelid, const Oid pkrelid,
+                                           Oid fkrelid, Oid pkrelid,
                                            HeapTuple contuple, LOCKMODE lockmode,
                                            Oid ReferencedParentDelTrigger,
                                            Oid ReferencedParentUpdTrigger,
@@ -415,7 +415,7 @@ static void AlterConstrTriggerDeferrability(Oid conoid, Relation tgrel, Relation
                                            List **otherrelids);
 static void AlterConstrEnforceabilityRecurse(List **wqueue, ATAlterConstraint *cmdcon,
                                             Relation conrel, Relation tgrel,
-                                            const Oid fkrelid, const Oid pkrelid,
+                                            Oid fkrelid, Oid pkrelid,
                                             HeapTuple contuple, LOCKMODE lockmode,
                                             Oid ReferencedParentDelTrigger,
                                             Oid ReferencedParentUpdTrigger,
@@ -503,7 +503,7 @@ static ObjectAddress ATExecDropNotNull(Relation rel, const char *colName, bool r
 static void set_attnotnull(List **wqueue, Relation rel, AttrNumber attnum,
                           bool is_valid, bool queue_validation);
 static ObjectAddress ATExecSetNotNull(List **wqueue, Relation rel,
-                                     char *constrname, char *colName,
+                                     char *conName, char *colName,
                                      bool recurse, bool recursing,
                                      LOCKMODE lockmode);
 static bool NotNullImpliedByRelConstraints(Relation rel, Form_pg_attribute attr);
@@ -733,7 +733,7 @@ static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, Relation parentIdx,
 static void validatePartitionedIndex(Relation partedIdx, Relation partedTbl);
 static void refuseDupeIndexAttach(Relation parentIdx, Relation partIdx,
                                  Relation partitionTbl);
-static void verifyPartitionIndexNotNull(IndexInfo *iinfo, Relation partIdx);
+static void verifyPartitionIndexNotNull(IndexInfo *iinfo, Relation partition);
 static List *GetParentedForeignKeyRefs(Relation partition);
 static void ATDetachCheckNoForeignKeyRefs(Relation partition);
 static char GetAttributeCompression(Oid atttypid, const char *compression);

diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c
index 0374476ffad9ea8f13518cd71aaab34e427dc0dd..5a77c25382687089e5058f9080da24583a75a3f4 100644 (file)
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@ -191,7 +191,7 @@ static void InitPartitionPruneContext(PartitionPruneContext *context,
                                      PartitionKey partkey,
                                      PlanState *planstate,
                                      ExprContext *econtext);
-static void InitExecPartitionPruneContexts(PartitionPruneState *prunstate,
+static void InitExecPartitionPruneContexts(PartitionPruneState *prunestate,
                                           PlanState *parent_plan,
                                           Bitmapset *initially_valid_subplans,
                                           int n_total_subplans);

diff --git a/src/backend/nodes/queryjumblefuncs.c b/src/backend/nodes/queryjumblefuncs.c
index 513cf92d357f319186cbf56d912f603d54e51d56..27fb87d3aaa5b0212fa0f6efa8cd748241608b94 100644 (file)
--- a/src/backend/nodes/queryjumblefuncs.c
+++ b/src/backend/nodes/queryjumblefuncs.c
@@ -58,10 +58,10 @@ bool        query_id_enabled = false;
 static JumbleState *InitJumble(void);
 static uint64 DoJumble(JumbleState *jstate, Node *node);
 static void AppendJumble(JumbleState *jstate,
-                        const unsigned char *item, Size size);
+                        const unsigned char *value, Size size);
 static void FlushPendingNulls(JumbleState *jstate);
 static void RecordConstLocation(JumbleState *jstate,
-                               int location, bool merged);
+                               int location, bool squashed);
 static void _jumbleNode(JumbleState *jstate, Node *node);
 static void _jumbleElements(JumbleState *jstate, List *elements);
 static void _jumbleA_Const(JumbleState *jstate, Node *node);

diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index db8f2b1754e669d49368a84bbe7e3ba6315971c9..0b0e056eea29cd4717f555f4f223de59b93961fb 100644 (file)
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -527,7 +527,7 @@ static inline BufferDesc *BufferAlloc(SMgrRelation smgr,
                                      BlockNumber blockNum,
                                      BufferAccessStrategy strategy,
                                      bool *foundPtr, IOContext io_context);
-static bool AsyncReadBuffers(ReadBuffersOperation *operation, int *nblocks);
+static bool AsyncReadBuffers(ReadBuffersOperation *operation, int *nblocks_progress);
 static void CheckReadBuffersOperation(ReadBuffersOperation *operation, bool is_complete);
 static Buffer GetVictimBuffer(BufferAccessStrategy strategy, IOContext io_context);
 static void FlushBuffer(BufferDesc *buf, SMgrRelation reln,

diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index f99c9d9001342841d29963958a85a877a2db5adb..2ccb0faceb5b6b1d0464e0851bdebff29ea4fb75 100644 (file)
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -154,7 +154,7 @@ static BlockNumber _mdnblocks(SMgrRelation reln, ForkNumber forknum,
                              MdfdVec *seg);
 
 static PgAioResult md_readv_complete(PgAioHandle *ioh, PgAioResult prior_result, uint8 cb_data);
-static void md_readv_report(PgAioResult result, const PgAioTargetData *target_data, int elevel);
+static void md_readv_report(PgAioResult result, const PgAioTargetData *td, int elevel);
 
 const PgAioHandleCallbacks aio_md_readv_cb = {
    .complete_shared = md_readv_complete,

diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index ba14713fef22f7aa4b8bec95ab5866826dc66cb5..ca3c5ee3df3ae2583b7230eb35af87c39aa5e3ca 100644 (file)
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -127,7 +127,7 @@ static AclMode convert_tablespace_priv_string(text *priv_type_text);
 static Oid convert_type_name(text *typename);
 static AclMode convert_type_priv_string(text *priv_type_text);
 static AclMode convert_parameter_priv_string(text *priv_text);
-static AclMode convert_largeobject_priv_string(text *priv_text);
+static AclMode convert_largeobject_priv_string(text *priv_type_text);
 static AclMode convert_role_priv_string(text *priv_type_text);
 static AclResult pg_role_aclcheck(Oid role_oid, Oid roleid, AclMode mode);
 

diff --git a/src/backend/utils/adt/pg_locale_builtin.c b/src/backend/utils/adt/pg_locale_builtin.c
index 33ad20bbf07c98292ffcc5d6b059753a3ac4f431..125b10ff7ab75a66263cf651ff7ce7ebb44e5d05 100644 (file)
--- a/src/backend/utils/adt/pg_locale_builtin.c
+++ b/src/backend/utils/adt/pg_locale_builtin.c
@@ -25,13 +25,13 @@
 extern pg_locale_t create_pg_locale_builtin(Oid collid,
                                            MemoryContext context);
 extern char *get_collation_actual_version_builtin(const char *collcollate);
-extern size_t strlower_builtin(char *dst, size_t dstsize, const char *src,
+extern size_t strlower_builtin(char *dest, size_t destsize, const char *src,
                               ssize_t srclen, pg_locale_t locale);
-extern size_t strtitle_builtin(char *dst, size_t dstsize, const char *src,
+extern size_t strtitle_builtin(char *dest, size_t destsize, const char *src,
                               ssize_t srclen, pg_locale_t locale);
-extern size_t strupper_builtin(char *dst, size_t dstsize, const char *src,
+extern size_t strupper_builtin(char *dest, size_t destsize, const char *src,
                               ssize_t srclen, pg_locale_t locale);
-extern size_t strfold_builtin(char *dst, size_t dstsize, const char *src,
+extern size_t strfold_builtin(char *dest, size_t destsize, const char *src,
                              ssize_t srclen, pg_locale_t locale);
 
 

diff --git a/src/backend/utils/adt/pg_locale_icu.c b/src/backend/utils/adt/pg_locale_icu.c
index b0c73f2e43d01adc0c21803521ba389bdb090032..a32c32a0744bd6868bbcd212c40ceb52de66f24f 100644 (file)
--- a/src/backend/utils/adt/pg_locale_icu.c
+++ b/src/backend/utils/adt/pg_locale_icu.c
@@ -48,28 +48,22 @@
 #define        TEXTBUFLEN          1024
 
 extern pg_locale_t create_pg_locale_icu(Oid collid, MemoryContext context);
-extern size_t strlower_icu(char *dst, size_t dstsize, const char *src,
+extern size_t strlower_icu(char *dest, size_t destsize, const char *src,
                           ssize_t srclen, pg_locale_t locale);
-extern size_t strtitle_icu(char *dst, size_t dstsize, const char *src,
+extern size_t strtitle_icu(char *dest, size_t destsize, const char *src,
                           ssize_t srclen, pg_locale_t locale);
-extern size_t strupper_icu(char *dst, size_t dstsize, const char *src,
+extern size_t strupper_icu(char *dest, size_t destsize, const char *src,
                           ssize_t srclen, pg_locale_t locale);
-extern size_t strfold_icu(char *dst, size_t dstsize, const char *src,
+extern size_t strfold_icu(char *dest, size_t destsize, const char *src,
                          ssize_t srclen, pg_locale_t locale);
 
 #ifdef USE_ICU
 
 extern UCollator *pg_ucol_open(const char *loc_str);
 
-static int strncoll_icu(const char *arg1, ssize_t len1,
-                        const char *arg2, ssize_t len2,
-                        pg_locale_t locale);
 static size_t strnxfrm_icu(char *dest, size_t destsize,
                           const char *src, ssize_t srclen,
                           pg_locale_t locale);
-static size_t strnxfrm_prefix_icu(char *dest, size_t destsize,
-                                 const char *src, ssize_t srclen,
-                                 pg_locale_t locale);
 extern char *get_collation_actual_version_icu(const char *collcollate);
 
 typedef int32_t (*ICU_Convert_Func) (UChar *dest, int32_t destCapacity,

diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 677ee42596f5d36e5edf9a4f84ffc6249f0bff12..1f5ebf2e1242183fc1826db0ca6a5e384a7187fe 100644 (file)
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -184,7 +184,7 @@ static void MemoryContextStatsInternal(MemoryContext context, int level,
 static void MemoryContextStatsPrint(MemoryContext context, void *passthru,
                                    const char *stats_string,
                                    bool print_to_stderr);
-static void PublishMemoryContext(MemoryStatsEntry *memcxt_infos,
+static void PublishMemoryContext(MemoryStatsEntry *memcxt_info,
                                 int curr_id, MemoryContext context,
                                 List *path,
                                 MemoryContextCounters stat,

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 860a0fcb46bde4e0a22a51783a866c49dafdc425..8ddcc5312f754db5d5428c986f0204fd7dcfb780 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -60,7 +60,7 @@ static void gen_reindex_command(PGconn *conn, ReindexType type,
                                PQExpBufferData *sql);
 static void run_reindex_command(PGconn *conn, ReindexType type,
                                const char *name, bool echo,
-                               PQExpBufferData *sq);
+                               PQExpBufferData *sql);
 
 static void help(const char *progname);
 

diff --git a/src/common/unicode_case.c b/src/common/unicode_case.c
index 26722e9a2d956469ae6e21aa41c927d4eeadf55d..073faf6a0d58b9c5c36e7ab1cfe471f4f42e15f2 100644 (file)
--- a/src/common/unicode_case.c
+++ b/src/common/unicode_case.c
@@ -44,7 +44,7 @@ static size_t convert_case(char *dst, size_t dstsize, const char *src, ssize_t s
                           void *wbstate);
 static enum CaseMapResult casemap(pg_wchar u1, CaseKind casekind, bool full,
                                  const char *src, size_t srclen, size_t srcoff,
-                                 pg_wchar *u2, const pg_wchar **special);
+                                 pg_wchar *simple, const pg_wchar **special);
 
 pg_wchar
 unicode_lowercase_simple(pg_wchar code)

diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 387839eb5d2682d30e6f097ab1164479572f5192..03c5b3d73e5c610a68dcfd43351c1d6c371ec51a 100644 (file)
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -64,7 +64,7 @@ extern void ExplainOneUtility(Node *utilityStmt, IntoClause *into,
                              ParamListInfo params);
 
 extern void ExplainOnePlan(PlannedStmt *plannedstmt, CachedPlan *cplan,
-                          CachedPlanSource *plansource, int plan_index,
+                          CachedPlanSource *plansource, int query_index,
                           IntoClause *into, struct ExplainState *es,
                           const char *queryString,
                           ParamListInfo params, QueryEnvironment *queryEnv,

diff --git a/src/include/libpq/oauth.h b/src/include/libpq/oauth.h
index 3f4c9acd8b0b3283437ac3b8c9269fb80ce11569..f75d2e31a68a8e7d2ef76abd7f29e1ae7cae1d30 100644 (file)
--- a/src/include/libpq/oauth.h
+++ b/src/include/libpq/oauth.h
@@ -96,6 +96,6 @@ extern PGDLLIMPORT const pg_be_sasl_mech pg_be_oauth_mech;
 /*
  * Ensure a validator named in the HBA is permitted by the configuration.
  */
-extern bool check_oauth_validator(HbaLine *hba, int elevel, char **err_msg);
+extern bool check_oauth_validator(HbaLine *hbaline, int elevel, char **err_msg);
 
 #endif                         /* PG_OAUTH_H */

diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 3aa3c16e442235e5626ca8f1bb5e3581ba8550da..c59874408178a6f6fec8c1bcab48d50d282ac4e4 100644 (file)
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -108,7 +108,7 @@ extern void cost_resultscan(Path *path, PlannerInfo *root,
                            RelOptInfo *baserel, ParamPathInfo *param_info);
 extern void cost_recursive_union(Path *runion, Path *nrterm, Path *rterm);
 extern void cost_sort(Path *path, PlannerInfo *root,
-                     List *pathkeys, int disabled_nodes,
+                     List *pathkeys, int input_disabled_nodes,
                      Cost input_cost, double tuples, int width,
                      Cost comparison_cost, int sort_mem,
                      double limit_tuples);
@@ -132,7 +132,7 @@ extern void cost_agg(Path *path, PlannerInfo *root,
                     AggStrategy aggstrategy, const AggClauseCosts *aggcosts,
                     int numGroupCols, double numGroups,
                     List *quals,
-                    int input_disabled_nodes,
+                    int disabled_nodes,
                     Cost input_startup_cost, Cost input_total_cost,
                     double input_tuples, double input_width);
 extern void cost_windowagg(Path *path, PlannerInfo *root,

diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 5a93019961141fbcceb143f3726454720bfa8eb6..9d3debcab2801a5a9e67dbd6e70e965c8a6f1083 100644 (file)
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -117,8 +117,8 @@ extern bool innerrel_is_unique(PlannerInfo *root,
 extern bool innerrel_is_unique_ext(PlannerInfo *root, Relids joinrelids,
                                   Relids outerrelids, RelOptInfo *innerrel,
                                   JoinType jointype, List *restrictlist,
-                                  bool force_cache, List **uclauses);
-extern List *remove_useless_self_joins(PlannerInfo *root, List *jointree);
+                                  bool force_cache, List **extra_clauses);
+extern List *remove_useless_self_joins(PlannerInfo *root, List *joinlist);
 
 /*
  * prototypes for plan/setrefs.c

diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
index 82313bb7fcfee82ad9500a65547de8d3a747e781..f9263c37538adcc2570899e3cba8a460898fd31f 100644 (file)
--- a/src/include/port/pg_crc32c.h
+++ b/src/include/port/pg_crc32c.h
@@ -107,7 +107,7 @@ extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len)
 extern PGDLLIMPORT pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
 extern pg_crc32c pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len);
 #ifdef USE_AVX512_CRC32C_WITH_RUNTIME_CHECK
-extern pg_crc32c pg_comp_crc32c_avx512(pg_crc32c crc, const void *data, size_t len);
+extern pg_crc32c pg_comp_crc32c_avx512(pg_crc32c crc, const void *data, size_t length);
 #endif
 
 #elif defined(USE_ARMV8_CRC32C)

diff --git a/src/include/replication/slot.h b/src/include/replication/slot.h
index f5a24ccfbf2b4e153621f5647dc6e9d53129a6ca..eb0b93b11141ddbf6a6c6fa857c7a055c80f8c74 100644 (file)
--- a/src/include/replication/slot.h
+++ b/src/include/replication/slot.h
@@ -307,7 +307,7 @@ extern void CheckPointReplicationSlots(bool is_shutdown);
 extern void CheckSlotRequirements(void);
 extern void CheckSlotPermissions(void);
 extern ReplicationSlotInvalidationCause
-           GetSlotInvalidationCause(const char *invalidation_reason);
+           GetSlotInvalidationCause(const char *cause_name);
 extern const char *GetSlotInvalidationCauseName(ReplicationSlotInvalidationCause cause);
 
 extern bool SlotExistsInSyncStandbySlots(const char *slot_name);

diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index d333f338ebb4cd1e415117c1da62e57cd8d6366d..70d386cf0e077ba4a5f2d4b544f2aecd5ecc84a5 100644 (file)
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -129,8 +129,8 @@ extern bool LWLockAcquireOrWait(LWLock *lock, LWLockMode mode);
 extern void LWLockRelease(LWLock *lock);
 extern void LWLockReleaseClearVar(LWLock *lock, pg_atomic_uint64 *valptr, uint64 val);
 extern void LWLockReleaseAll(void);
-extern void LWLockDisown(LWLock *l);
-extern void LWLockReleaseDisowned(LWLock *l, LWLockMode mode);
+extern void LWLockDisown(LWLock *lock);
+extern void LWLockReleaseDisowned(LWLock *lock, LWLockMode mode);
 extern bool LWLockHeldByMe(LWLock *lock);
 extern bool LWLockAnyHeldByMe(LWLock *lock, int nlocks, size_t stride);
 extern bool LWLockHeldByMeInMode(LWLock *lock, LWLockMode mode);

diff --git a/src/include/storage/md.h b/src/include/storage/md.h
index f630b75446c01e08295d6a4580a9766122e65cf4..b563c27abf09215264e899c19e98f50ad5589544 100644 (file)
--- a/src/include/storage/md.h
+++ b/src/include/storage/md.h
@@ -49,7 +49,7 @@ extern void mdwriteback(SMgrRelation reln, ForkNumber forknum,
                        BlockNumber blocknum, BlockNumber nblocks);
 extern BlockNumber mdnblocks(SMgrRelation reln, ForkNumber forknum);
 extern void mdtruncate(SMgrRelation reln, ForkNumber forknum,
-                      BlockNumber old_blocks, BlockNumber nblocks);
+                      BlockNumber curnblk, BlockNumber nblocks);
 extern void mdimmedsync(SMgrRelation reln, ForkNumber forknum);
 extern void mdregistersync(SMgrRelation reln, ForkNumber forknum);
 extern int mdfd(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, uint32 *off);

diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h
index 7df90f43f60e85e94cec3329913c5966da6e7774..7b8cbf58d2c43c60cfcbed6bb3f483216f4c6ff0 100644 (file)
--- a/src/include/utils/pg_locale.h
+++ b/src/include/utils/pg_locale.h
@@ -125,16 +125,16 @@ extern void init_database_collation(void);
 extern pg_locale_t pg_newlocale_from_collation(Oid collid);
 
 extern char *get_collation_actual_version(char collprovider, const char *collcollate);
-extern size_t pg_strlower(char *dest, size_t destsize,
+extern size_t pg_strlower(char *dst, size_t dstsize,
                          const char *src, ssize_t srclen,
                          pg_locale_t locale);
-extern size_t pg_strtitle(char *dest, size_t destsize,
+extern size_t pg_strtitle(char *dst, size_t dstsize,
                          const char *src, ssize_t srclen,
                          pg_locale_t locale);
-extern size_t pg_strupper(char *dest, size_t destsize,
+extern size_t pg_strupper(char *dst, size_t dstsize,
                          const char *src, ssize_t srclen,
                          pg_locale_t locale);
-extern size_t pg_strfold(char *dest, size_t destsize,
+extern size_t pg_strfold(char *dst, size_t dstsize,
                         const char *src, ssize_t srclen,
                         pg_locale_t locale);
 extern int pg_strcoll(const char *arg1, const char *arg2, pg_locale_t locale);

diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h
index ed7c454f44e2747f45aaa64219dc8d6c22852103..865ba7b82655114d9baa5063087567af34b97074 100644 (file)
--- a/src/include/utils/tuplestore.h
+++ b/src/include/utils/tuplestore.h
@@ -65,7 +65,7 @@ extern void tuplestore_copy_read_pointer(Tuplestorestate *state,
 
 extern void tuplestore_trim(Tuplestorestate *state);
 
-extern void tuplestore_get_stats(Tuplestorestate *state, char **storage_type,
+extern void tuplestore_get_stats(Tuplestorestate *state, char **max_storage_type,
                                 int64 *max_space);
 
 extern bool tuplestore_in_memory(Tuplestorestate *state);

diff --git a/src/test/modules/oauth_validator/fail_validator.c b/src/test/modules/oauth_validator/fail_validator.c
index a4c7a4451d38daaf2a1822b3d7e7f2114a815da5..bf04182a4861250257193ffd99ca552d7fc8c897 100644 (file)
--- a/src/test/modules/oauth_validator/fail_validator.c
+++ b/src/test/modules/oauth_validator/fail_validator.c
@@ -22,7 +22,7 @@ PG_MODULE_MAGIC;
 static bool fail_token(const ValidatorModuleState *state,
                       const char *token,
                       const char *role,
-                      ValidatorModuleResult *result);
+                      ValidatorModuleResult *res);
 
 /* Callback implementations (we only need the main one) */
 static const OAuthValidatorCallbacks validator_callbacks = {

diff --git a/src/test/modules/oauth_validator/magic_validator.c b/src/test/modules/oauth_validator/magic_validator.c
index 9dc55b602e38bf27a9b47d533a40d2c3659c8854..e0547caf22f3c16fe91e033f1389b4c8f863f5ca 100644 (file)
--- a/src/test/modules/oauth_validator/magic_validator.c
+++ b/src/test/modules/oauth_validator/magic_validator.c
@@ -23,7 +23,7 @@ PG_MODULE_MAGIC;
 static bool validate_token(const ValidatorModuleState *state,
                           const char *token,
                           const char *role,
-                          ValidatorModuleResult *result);
+                          ValidatorModuleResult *res);
 
 /* Callback implementations (we only need the main one) */
 static const OAuthValidatorCallbacks validator_callbacks = {

diff --git a/src/test/modules/oauth_validator/validator.c b/src/test/modules/oauth_validator/validator.c
index b2e5d182e1bf4790301f79b4651e3849d8b7c5a8..42b69646fbb9cf8067be1d1a7b47759a10f63089 100644 (file)
--- a/src/test/modules/oauth_validator/validator.c
+++ b/src/test/modules/oauth_validator/validator.c
@@ -26,7 +26,7 @@ static void validator_shutdown(ValidatorModuleState *state);
 static bool validate_token(const ValidatorModuleState *state,
                           const char *token,
                           const char *role,
-                          ValidatorModuleResult *result);
+                          ValidatorModuleResult *res);
 
 /* Callback implementations (exercise all three) */
 static const OAuthValidatorCallbacks validator_callbacks = {