diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/commands/explain.h | 2 | ||||
-rw-r--r-- | src/include/libpq/oauth.h | 2 | ||||
-rw-r--r-- | src/include/optimizer/cost.h | 4 | ||||
-rw-r--r-- | src/include/optimizer/planmain.h | 4 | ||||
-rw-r--r-- | src/include/port/pg_crc32c.h | 2 | ||||
-rw-r--r-- | src/include/replication/slot.h | 2 | ||||
-rw-r--r-- | src/include/storage/lwlock.h | 4 | ||||
-rw-r--r-- | src/include/storage/md.h | 2 | ||||
-rw-r--r-- | src/include/utils/pg_locale.h | 8 | ||||
-rw-r--r-- | src/include/utils/tuplestore.h | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 387839eb5d2..03c5b3d73e5 100644 --- 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 3f4c9acd8b0..f75d2e31a68 100644 --- 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 3aa3c16e442..c5987440817 100644 --- 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 5a930199611..9d3debcab28 100644 --- 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 82313bb7fcf..f9263c37538 100644 --- 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 f5a24ccfbf2..eb0b93b1114 100644 --- 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 d333f338ebb..70d386cf0e0 100644 --- 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 f630b75446c..b563c27abf0 100644 --- 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 7df90f43f60..7b8cbf58d2c 100644 --- 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 ed7c454f44e..865ba7b8265 100644 --- 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); |