0001-Clean-up-qsort-comparison-function-for-GUC-entries.patch

From 2e267c1de1e44de4729547adfd296ecf4ee56fa7 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Fri, 7 Nov 2025 09:25:43 +0100
Subject: [PATCH 1/3] Clean up qsort comparison function for GUC entries

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.
---
 src/backend/utils/misc/guc.c   | 6 +++---
 src/include/utils/guc_tables.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 679846da42c..f3411d34f0c 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -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 = *(struct config_generic *const *) a;
+	const struct config_generic *cb = *(struct config_generic *const *) b;
 
-	return guc_name_compare(namea, nameb);
+	return guc_name_compare(ca->name, cb->name);
 }
 
 /*
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index bbfcc633014..04cc60eb526 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -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 */
-- 
2.51.0