summaryrefslogtreecommitdiff
path: root/src/include/common
diff options
context:
space:
mode:
authorPeter Geoghegan2022-09-20 20:09:30 +0000
committerPeter Geoghegan2022-09-20 20:09:30 +0000
commita601366a460f68472bf70c4d94c57baa0a3ed1b2 (patch)
treee2dbfff4d642eab7d34661367ec1b4938033c2a8 /src/include/common
parentc3382a3c3ccda6df126c95bf37dcc762480c5202 (diff)
Harmonize more parameter names in bulk.
Make sure that function declarations use names that exactly match the corresponding names from function definitions in optimizer, parser, utility, libpq, and "commands" code, as well as in remaining library code. Do the same for all code related to frontend programs (with the exception of pg_dump/pg_dumpall related code). Like other recent commits that cleaned up function parameter names, this commit was written with help from clang-tidy. Later commits will handle ecpg and pg_dump/pg_dumpall. Author: Peter Geoghegan <pg@bowt.ie> Reviewed-By: David Rowley <dgrowleyml@gmail.com> Discussion: https://postgr.es/m/CAH2-WznJt9CMM9KJTMjJh_zbL5hD9oX44qdJ4aqZtjFi-zA3Tg@mail.gmail.com
Diffstat (limited to 'src/include/common')
-rw-r--r--src/include/common/fe_memutils.h4
-rw-r--r--src/include/common/kwlookup.h2
-rw-r--r--src/include/common/scram-common.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/include/common/fe_memutils.h b/src/include/common/fe_memutils.h
index 63f2b6a802d..a1751b370d4 100644
--- a/src/include/common/fe_memutils.h
+++ b/src/include/common/fe_memutils.h
@@ -26,8 +26,8 @@ extern char *pg_strdup(const char *in);
extern void *pg_malloc(size_t size);
extern void *pg_malloc0(size_t size);
extern void *pg_malloc_extended(size_t size, int flags);
-extern void *pg_realloc(void *pointer, size_t size);
-extern void pg_free(void *pointer);
+extern void *pg_realloc(void *ptr, size_t size);
+extern void pg_free(void *ptr);
/*
* Variants with easier notation and more type safety
diff --git a/src/include/common/kwlookup.h b/src/include/common/kwlookup.h
index 48d7f08b838..8384e33a5a8 100644
--- a/src/include/common/kwlookup.h
+++ b/src/include/common/kwlookup.h
@@ -32,7 +32,7 @@ typedef struct ScanKeywordList
} ScanKeywordList;
-extern int ScanKeywordLookup(const char *text, const ScanKeywordList *keywords);
+extern int ScanKeywordLookup(const char *str, const ScanKeywordList *keywords);
/* Code that wants to retrieve the text of the N'th keyword should use this. */
static inline const char *
diff --git a/src/include/common/scram-common.h b/src/include/common/scram-common.h
index d1f840c11c7..e1f5e786e01 100644
--- a/src/include/common/scram-common.h
+++ b/src/include/common/scram-common.h
@@ -49,7 +49,7 @@
extern int scram_SaltedPassword(const char *password, const char *salt,
int saltlen, int iterations, uint8 *result,
const char **errstr);
-extern int scram_H(const uint8 *str, int len, uint8 *result,
+extern int scram_H(const uint8 *input, int len, uint8 *result,
const char **errstr);
extern int scram_ClientKey(const uint8 *salted_password, uint8 *result,
const char **errstr);