diff options
Diffstat (limited to 'src/backend/utils/misc')
| -rw-r--r-- | src/backend/utils/misc/gen_guc_tables.pl | 1 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 28 |
2 files changed, 2 insertions, 27 deletions
diff --git a/src/backend/utils/misc/gen_guc_tables.pl b/src/backend/utils/misc/gen_guc_tables.pl index a48a9ebd0eb..b187259bf1e 100644 --- a/src/backend/utils/misc/gen_guc_tables.pl +++ b/src/backend/utils/misc/gen_guc_tables.pl @@ -68,6 +68,7 @@ sub print_one_table if $entry->{long_desc}; printf $ofh "\t\t\t.flags = %s,\n", $entry->{flags} if $entry->{flags}; + printf $ofh "\t\t\t.vartype = %s,\n", ('PGC_' . uc($type)); print $ofh "\t\t},\n"; printf $ofh "\t\t.variable = &%s,\n", $entry->{variable}; printf $ofh "\t\t.boot_val = %s,\n", $entry->{boot_val}; diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index a64427ac979..a82286cc98a 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -890,48 +890,22 @@ build_guc_variables(void) ALLOCSET_DEFAULT_SIZES); /* - * Count all the built-in variables, and set their vartypes correctly. + * Count all the built-in variables. */ for (int i = 0; ConfigureNamesBool[i].gen.name; i++) - { - struct config_bool *conf = &ConfigureNamesBool[i]; - - /* Rather than requiring vartype to be filled in by hand, do this: */ - conf->gen.vartype = PGC_BOOL; num_vars++; - } for (int i = 0; ConfigureNamesInt[i].gen.name; i++) - { - struct config_int *conf = &ConfigureNamesInt[i]; - - conf->gen.vartype = PGC_INT; num_vars++; - } for (int i = 0; ConfigureNamesReal[i].gen.name; i++) - { - struct config_real *conf = &ConfigureNamesReal[i]; - - conf->gen.vartype = PGC_REAL; num_vars++; - } for (int i = 0; ConfigureNamesString[i].gen.name; i++) - { - struct config_string *conf = &ConfigureNamesString[i]; - - conf->gen.vartype = PGC_STRING; num_vars++; - } for (int i = 0; ConfigureNamesEnum[i].gen.name; i++) - { - struct config_enum *conf = &ConfigureNamesEnum[i]; - - conf->gen.vartype = PGC_ENUM; num_vars++; - } /* * Create hash table with 20% slack |