database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-19 15:49:24 +03:00
Code Activity

Add some const qualifiers

Browse Source 
in guc-related source files, in anticipation of some further
restructuring.

Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/8fdfb91e-60fb-44fa-8df6-f5dea47353c9@eisentraut.org
This commit is contained in:
Peter Eisentraut
2025-10-03 08:27:18 +02:00
parent 1a79518888
commit 29dc7a6687
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/backend/utils/misc/guc.c
View File

@@ -261,15 +261,15 @@ static bool assignable_custom_variable_name(const char *name, bool skip_errors,
int elevel); int elevel);
static void do_serialize(char **destptr, Size *maxbytes, static void do_serialize(char **destptr, Size *maxbytes,
const char *fmt,...) pg_attribute_printf(3, 4); const char *fmt,...) pg_attribute_printf(3, 4);
static bool call_bool_check_hook(struct config_bool *conf, bool *newval, static bool call_bool_check_hook(const struct config_bool *conf, bool *newval,
void **extra, GucSource source, int elevel); void **extra, GucSource source, int elevel);
static bool call_int_check_hook(struct config_int *conf, int *newval, static bool call_int_check_hook(const struct config_int *conf, int *newval,
void **extra, GucSource source, int elevel); void **extra, GucSource source, int elevel);
static bool call_real_check_hook(struct config_real *conf, double *newval, static bool call_real_check_hook(const struct config_real *conf, double *newval,
void **extra, GucSource source, int elevel); void **extra, GucSource source, int elevel);
static bool call_string_check_hook(struct config_string *conf, char **newval, static bool call_string_check_hook(const struct config_string *conf, char **newval,
void **extra, GucSource source, int elevel); void **extra, GucSource source, int elevel);
static bool call_enum_check_hook(struct config_enum *conf, int *newval, static bool call_enum_check_hook(const struct config_enum *conf, int *newval,
void **extra, GucSource source, int elevel); void **extra, GucSource source, int elevel);
@@ -1425,14 +1425,14 @@ check_GUC_name_for_parameter_acl(const char *name)
*/ */
#ifdef USE_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
static bool static bool
check_GUC_init(struct config_generic *gconf) check_GUC_init(const struct config_generic *gconf)
{ {
/* Checks on values */ /* Checks on values */
switch (gconf->vartype) switch (gconf->vartype)
{ {
case PGC_BOOL: case PGC_BOOL:
{ {
struct config_bool *conf = (struct config_bool *) gconf; const struct config_bool *conf = (const struct config_bool *) gconf;
if (*conf->variable && !conf->boot_val) if (*conf->variable && !conf->boot_val)
{ {
@@ -1444,7 +1444,7 @@ check_GUC_init(struct config_generic *gconf)
} }
case PGC_INT: case PGC_INT:
{ {
struct config_int *conf = (struct config_int *) gconf; const struct config_int *conf = (const struct config_int *) gconf;
if (*conf->variable != 0 && *conf->variable != conf->boot_val) if (*conf->variable != 0 && *conf->variable != conf->boot_val)
{ {
@@ -1456,7 +1456,7 @@ check_GUC_init(struct config_generic *gconf)
} }
case PGC_REAL: case PGC_REAL:
{ {
struct config_real *conf = (struct config_real *) gconf; const struct config_real *conf = (const struct config_real *) gconf;
if (*conf->variable != 0.0 && *conf->variable != conf->boot_val) if (*conf->variable != 0.0 && *conf->variable != conf->boot_val)
{ {
@@ -1468,7 +1468,7 @@ check_GUC_init(struct config_generic *gconf)
} }
case PGC_STRING: case PGC_STRING:
{ {
struct config_string *conf = (struct config_string *) gconf; const struct config_string *conf = (const struct config_string *) gconf;
if (*conf->variable != NULL && if (*conf->variable != NULL &&
(conf->boot_val == NULL || (conf->boot_val == NULL ||
@@ -1482,7 +1482,7 @@ check_GUC_init(struct config_generic *gconf)
} }
case PGC_ENUM: case PGC_ENUM:
{ {
struct config_enum *conf = (struct config_enum *) gconf; const struct config_enum *conf = (const struct config_enum *) gconf;
if (*conf->variable != conf->boot_val) if (*conf->variable != conf->boot_val)
{ {
@@ -3013,7 +3013,7 @@ parse_real(const char *value, double *result, int flags, const char **hintmsg)
* allocated for modification. * allocated for modification.
*/ */
const char * const char *
config_enum_lookup_by_value(struct config_enum *record, int val) config_enum_lookup_by_value(const struct config_enum *record, int val)
{ {
for (const struct config_enum_entry *entry = record->options; entry && entry->name; entry++) for (const struct config_enum_entry *entry = record->options; entry && entry->name; entry++)
{ {
@@ -3034,7 +3034,7 @@ config_enum_lookup_by_value(struct config_enum *record, int val)
* true. If it's not found, return false and retval is set to 0. * true. If it's not found, return false and retval is set to 0.
*/ */
bool bool
config_enum_lookup_by_name(struct config_enum *record, const char *value, config_enum_lookup_by_name(const struct config_enum *record, const char *value,
int *retval) int *retval)
{ {
for (const struct config_enum_entry *entry = record->options; entry && entry->name; entry++) for (const struct config_enum_entry *entry = record->options; entry && entry->name; entry++)
@@ -3058,7 +3058,7 @@ config_enum_lookup_by_name(struct config_enum *record, const char *value,
* If suffix is non-NULL, it is added to the end of the string. * If suffix is non-NULL, it is added to the end of the string.
*/ */
char * char *
config_enum_get_options(struct config_enum *record, const char *prefix, config_enum_get_options(const struct config_enum *record, const char *prefix,
const char *suffix, const char *separator) const char *suffix, const char *separator)
{ {
StringInfoData retstr; StringInfoData retstr;
@@ -3114,7 +3114,7 @@ config_enum_get_options(struct config_enum *record, const char *prefix,
* Returns true if OK, false if not (or throws error, if elevel >= ERROR) * Returns true if OK, false if not (or throws error, if elevel >= ERROR)
*/ */
static bool static bool
parse_and_validate_value(struct config_generic *record, parse_and_validate_value(const struct config_generic *record,
const char *value, const char *value,
GucSource source, int elevel, GucSource source, int elevel,
union config_var_val *newval, void **newextra) union config_var_val *newval, void **newextra)
@@ -3123,7 +3123,7 @@ parse_and_validate_value(struct config_generic *record,
{ {
case PGC_BOOL: case PGC_BOOL:
{ {
struct config_bool *conf = (struct config_bool *) record; const struct config_bool *conf = (const struct config_bool *) record;
if (!parse_bool(value, &newval->boolval)) if (!parse_bool(value, &newval->boolval))
{ {
@@ -3141,7 +3141,7 @@ parse_and_validate_value(struct config_generic *record,
break; break;
case PGC_INT: case PGC_INT:
{ {
struct config_int *conf = (struct config_int *) record; const struct config_int *conf = (const struct config_int *) record;
const char *hintmsg; const char *hintmsg;
if (!parse_int(value, &newval->intval, if (!parse_int(value, &newval->intval,
@@ -3182,7 +3182,7 @@ parse_and_validate_value(struct config_generic *record,
break; break;
case PGC_REAL: case PGC_REAL:
{ {
struct config_real *conf = (struct config_real *) record; const struct config_real *conf = (const struct config_real *) record;
const char *hintmsg; const char *hintmsg;
if (!parse_real(value, &newval->realval, if (!parse_real(value, &newval->realval,
@@ -3223,7 +3223,7 @@ parse_and_validate_value(struct config_generic *record,
break; break;
case PGC_STRING: case PGC_STRING:
{ {
struct config_string *conf = (struct config_string *) record; const struct config_string *conf = (const struct config_string *) record;
/* /*
* The value passed by the caller could be transient, so we * The value passed by the caller could be transient, so we
@@ -3253,7 +3253,7 @@ parse_and_validate_value(struct config_generic *record,
break; break;
case PGC_ENUM: case PGC_ENUM:
{ {
struct config_enum *conf = (struct config_enum *) record; const struct config_enum *conf = (const struct config_enum *) record;
if (!config_enum_lookup_by_name(conf, value, &newval->enumval)) if (!config_enum_lookup_by_name(conf, value, &newval->enumval))
{ {
@@ -5456,7 +5456,7 @@ GetConfigOptionByName(const char *name, const char **varname, bool missing_ok)
* The result string is palloc'd. * The result string is palloc'd.
*/ */
char * char *
ShowGUCOption(struct config_generic *record, bool use_units) ShowGUCOption(const struct config_generic *record, bool use_units)
{ {
char buffer[256]; char buffer[256];
const char *val; const char *val;
@@ -5465,7 +5465,7 @@ ShowGUCOption(struct config_generic *record, bool use_units)
{ {
case PGC_BOOL: case PGC_BOOL:
{ {
struct config_bool *conf = (struct config_bool *) record; const struct config_bool *conf = (const struct config_bool *) record;
if (conf->show_hook) if (conf->show_hook)
val = conf->show_hook(); val = conf->show_hook();
@@ -5476,7 +5476,7 @@ ShowGUCOption(struct config_generic *record, bool use_units)
case PGC_INT: case PGC_INT:
{ {
struct config_int *conf = (struct config_int *) record; const struct config_int *conf = (const struct config_int *) record;
if (conf->show_hook) if (conf->show_hook)
val = conf->show_hook(); val = conf->show_hook();
@@ -5505,7 +5505,7 @@ ShowGUCOption(struct config_generic *record, bool use_units)
case PGC_REAL: case PGC_REAL:
{ {
struct config_real *conf = (struct config_real *) record; const struct config_real *conf = (const struct config_real *) record;
if (conf->show_hook) if (conf->show_hook)
val = conf->show_hook(); val = conf->show_hook();
@@ -5530,7 +5530,7 @@ ShowGUCOption(struct config_generic *record, bool use_units)
case PGC_STRING: case PGC_STRING:
{ {
struct config_string *conf = (struct config_string *) record; const struct config_string *conf = (const struct config_string *) record;
if (conf->show_hook) if (conf->show_hook)
val = conf->show_hook(); val = conf->show_hook();
@@ -5543,7 +5543,7 @@ ShowGUCOption(struct config_generic *record, bool use_units)
case PGC_ENUM: case PGC_ENUM:
{ {
struct config_enum *conf = (struct config_enum *) record; const struct config_enum *conf = (const struct config_enum *) record;
if (conf->show_hook) if (conf->show_hook)
val = conf->show_hook(); val = conf->show_hook();
@@ -6789,7 +6789,7 @@ GUC_check_errcode(int sqlerrcode)
*/ */
static bool static bool
call_bool_check_hook(struct config_bool *conf, bool *newval, void **extra, call_bool_check_hook(const struct config_bool *conf, bool *newval, void **extra,
GucSource source, int elevel) GucSource source, int elevel)
{ {
/* Quick success if no hook */ /* Quick success if no hook */
@@ -6823,7 +6823,7 @@ call_bool_check_hook(struct config_bool *conf, bool *newval, void **extra,
} }
static bool static bool
call_int_check_hook(struct config_int *conf, int *newval, void **extra, call_int_check_hook(const struct config_int *conf, int *newval, void **extra,
GucSource source, int elevel) GucSource source, int elevel)
{ {
/* Quick success if no hook */ /* Quick success if no hook */
@@ -6857,7 +6857,7 @@ call_int_check_hook(struct config_int *conf, int *newval, void **extra,
} }
static bool static bool
call_real_check_hook(struct config_real *conf, double *newval, void **extra, call_real_check_hook(const struct config_real *conf, double *newval, void **extra,
GucSource source, int elevel) GucSource source, int elevel)
{ {
/* Quick success if no hook */ /* Quick success if no hook */
@@ -6891,7 +6891,7 @@ call_real_check_hook(struct config_real *conf, double *newval, void **extra,
} }
static bool static bool
call_string_check_hook(struct config_string *conf, char **newval, void **extra, call_string_check_hook(const struct config_string *conf, char **newval, void **extra,
GucSource source, int elevel) GucSource source, int elevel)
{ {
volatile bool result = true; volatile bool result = true;
@@ -6941,7 +6941,7 @@ call_string_check_hook(struct config_string *conf, char **newval, void **extra,
} }
static bool static bool
call_enum_check_hook(struct config_enum *conf, int *newval, void **extra, call_enum_check_hook(const struct config_enum *conf, int *newval, void **extra,
GucSource source, int elevel) GucSource source, int elevel)
{ {
/* Quick success if no hook */ /* Quick success if no hook */

16
src/backend/utils/misc/guc_funcs.c
View File

@@ -578,7 +578,7 @@ pg_settings_get_flags(PG_FUNCTION_ARGS)
* Return whether or not the GUC variable is visible to the current user. * Return whether or not the GUC variable is visible to the current user.
*/ */
bool bool
ConfigOptionIsVisible(struct config_generic *conf) ConfigOptionIsVisible(const struct config_generic *conf)
{ {
if ((conf->flags & GUC_SUPERUSER_ONLY) && if ((conf->flags & GUC_SUPERUSER_ONLY) &&
!has_privs_of_role(GetUserId(), ROLE_PG_READ_ALL_SETTINGS)) !has_privs_of_role(GetUserId(), ROLE_PG_READ_ALL_SETTINGS))
@@ -591,7 +591,7 @@ ConfigOptionIsVisible(struct config_generic *conf)
* Extract fields to show in pg_settings for given variable. * Extract fields to show in pg_settings for given variable.
*/ */
static void static void
GetConfigOptionValues(struct config_generic *conf, const char **values) GetConfigOptionValues(const struct config_generic *conf, const char **values)
{ {
char buffer[256]; char buffer[256];
@@ -629,7 +629,7 @@ GetConfigOptionValues(struct config_generic *conf, const char **values)
{ {
case PGC_BOOL: case PGC_BOOL:
{ {
struct config_bool *lconf = (struct config_bool *) conf; const struct config_bool *lconf = (const struct config_bool *) conf;
/* min_val */ /* min_val */
values[9] = NULL; values[9] = NULL;
@@ -650,7 +650,7 @@ GetConfigOptionValues(struct config_generic *conf, const char **values)
case PGC_INT: case PGC_INT:
{ {
struct config_int *lconf = (struct config_int *) conf; const struct config_int *lconf = (const struct config_int *) conf;
/* min_val */ /* min_val */
snprintf(buffer, sizeof(buffer), "%d", lconf->min); snprintf(buffer, sizeof(buffer), "%d", lconf->min);
@@ -675,7 +675,7 @@ GetConfigOptionValues(struct config_generic *conf, const char **values)
case PGC_REAL: case PGC_REAL:
{ {
struct config_real *lconf = (struct config_real *) conf; const struct config_real *lconf = (const struct config_real *) conf;
/* min_val */ /* min_val */
snprintf(buffer, sizeof(buffer), "%g", lconf->min); snprintf(buffer, sizeof(buffer), "%g", lconf->min);
@@ -700,7 +700,7 @@ GetConfigOptionValues(struct config_generic *conf, const char **values)
case PGC_STRING: case PGC_STRING:
{ {
struct config_string *lconf = (struct config_string *) conf; const struct config_string *lconf = (const struct config_string *) conf;
/* min_val */ /* min_val */
values[9] = NULL; values[9] = NULL;
@@ -727,7 +727,7 @@ GetConfigOptionValues(struct config_generic *conf, const char **values)
case PGC_ENUM: case PGC_ENUM:
{ {
struct config_enum *lconf = (struct config_enum *) conf; const struct config_enum *lconf = (const struct config_enum *) conf;
/* min_val */ /* min_val */
values[9] = NULL; values[9] = NULL;
@@ -741,7 +741,7 @@ GetConfigOptionValues(struct config_generic *conf, const char **values)
* NOTE! enumvals with double quotes in them are not * NOTE! enumvals with double quotes in them are not
* supported! * supported!
*/ */
values[11] = config_enum_get_options((struct config_enum *) conf, values[11] = config_enum_get_options(lconf,
"{\"", "\"}", "\",\""); "{\"", "\"}", "\",\"");
/* boot_val */ /* boot_val */

10
src/include/utils/guc_tables.h
View File

@@ -319,10 +319,10 @@ extern struct config_generic *find_option(const char *name,
extern struct config_generic **get_explain_guc_options(int *num); extern struct config_generic **get_explain_guc_options(int *num);
/* get string value of variable */ /* get string value of variable */
extern char *ShowGUCOption(struct config_generic *record, bool use_units); extern char *ShowGUCOption(const struct config_generic *record, bool use_units);
/* get whether or not the GUC variable is visible to current user */ /* get whether or not the GUC variable is visible to current user */
extern bool ConfigOptionIsVisible(struct config_generic *conf); extern bool ConfigOptionIsVisible(const struct config_generic *conf);
/* get the current set of variables */ /* get the current set of variables */
extern struct config_generic **get_guc_variables(int *num_vars); extern struct config_generic **get_guc_variables(int *num_vars);
@@ -330,10 +330,10 @@ extern struct config_generic **get_guc_variables(int *num_vars);
extern void build_guc_variables(void); extern void build_guc_variables(void);
/* search in enum options */ /* search in enum options */
extern const char *config_enum_lookup_by_value(struct config_enum *record, int val); extern const char *config_enum_lookup_by_value(const struct config_enum *record, int val);
extern bool config_enum_lookup_by_name(struct config_enum *record, extern bool config_enum_lookup_by_name(const struct config_enum *record,
const char *value, int *retval); const char *value, int *retval);
extern char *config_enum_get_options(struct config_enum *record, extern char *config_enum_get_options(const struct config_enum *record,
const char *prefix, const char *prefix,
const char *suffix, const char *suffix,
const char *separator); const char *separator);