sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-15 00:03:53 -05:00
Code Issues Projects Releases Wiki Activity

Clean up qsort comparison function for GUC entries

Browse Source 
guc_var_compare() is invoked from qsort() on an array of struct
config_generic, but the function accesses these directly as
strings (char *).  This relies on the name being the first field, so
this works.  But we can write this more clearly by using the struct
and then accessing the field through the struct.  Before the
reorganization of the GUC structs (commit a13833c35f9), the old code
was probably more convenient, but now we can write this more clearly
and correctly.

After this change, it is no longer required that the name is the first
field in struct config_generic, so remove that comment.

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/2c961fa1-14f6-44a2-985c-e30b95654e8d%40eisentraut.org
This commit is contained in:
Peter Eisentraut 2025-11-11 07:48:54 +01:00
parent e510378358
commit d2f24df19b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1164,10 +1164,10 @@ find_option(const char *name, bool create_placeholders, bool skip_errors,
static int
guc_var_compare(const void *a, const void *b)
{
const char *namea = **(const char **const *) a;
const char *nameb = **(const char **const *) b;
const struct config_generic *ca = *(const struct config_generic *const *) a;
const struct config_generic *cb = *(const struct config_generic *const *) b;
return guc_name_compare(namea, nameb);
return guc_name_compare(ca->name, cb->name);
}
/*

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

@ -249,7 +249,7 @@ struct config_enum
struct config_generic
{
/* constant fields, must be set correctly in initial value: */
const char *name; /* name of variable - MUST BE FIRST */
const char *name; /* name of variable */
GucContext context; /* context required to set the variable */
enum config_group group; /* to help organize variables by function */
const char *short_desc; /* short desc. of this variable's purpose */