Rename hook functions for debug_io_direct to match variable name.

petere · macdice · commit 155c81463c26 · 2023-08-24T22:27:53.000+12:00
Commit 319bae9 renamed the GUC. Rename the check and assign functions to match, and alphabetize. Back-patch to 16. Author: Peter Eisentraut <peter@eisentraut.org> Discussion: https://postgr.es/m/2769341e-fa28-c2ee-3e4b-53fdcaaf2271%40eisentraut.org
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -3886,7 +3886,7 @@ data_sync_elevel(int elevel)
 }
 
 bool
-check_io_direct(char **newval, void **extra, GucSource source)
+check_debug_io_direct(char **newval, void **extra, GucSource source)
 {
 	bool		result = true;
 	int			flags;
@@ -3960,15 +3960,15 @@ check_io_direct(char **newval, void **extra, GucSource source)
 	if (!result)
 		return result;
 
-	/* Save the flags in *extra, for use by assign_io_direct */
+	/* Save the flags in *extra, for use by assign_debug_io_direct */
 	*extra = guc_malloc(ERROR, sizeof(int));
 	*((int *) *extra) = flags;
 
 	return result;
 }
 
 extern void
-assign_io_direct(const char *newval, void *extra)
+assign_debug_io_direct(const char *newval, void *extra)
 {
 	int		   *flags = (int *) extra;
 
diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c
@@ -563,7 +563,7 @@ static char *datestyle_string;
 static char *server_encoding_string;
 static char *server_version_string;
 static int	server_version_num;
-static char *io_direct_string;
+static char *debug_io_direct_string;
 
 #ifdef HAVE_SYSLOG
 #define	DEFAULT_SYSLOG_FACILITY LOG_LOCAL0
@@ -4544,9 +4544,9 @@ struct config_string ConfigureNamesString[] =
 			NULL,
 			GUC_LIST_INPUT | GUC_NOT_IN_SAMPLE
 		},
-		&io_direct_string,
+		&debug_io_direct_string,
 		"",
-		check_io_direct, assign_io_direct, NULL
+		check_debug_io_direct, assign_debug_io_direct, NULL
 	},
 
 	/* End-of-list marker */
diff --git a/src/include/utils/guc_hooks.h b/src/include/utils/guc_hooks.h
@@ -49,6 +49,8 @@ extern bool check_cluster_name(char **newval, void **extra, GucSource source);
 extern const char *show_data_directory_mode(void);
 extern bool check_datestyle(char **newval, void **extra, GucSource source);
 extern void assign_datestyle(const char *newval, void *extra);
+extern bool check_debug_io_direct(char **newval, void **extra, GucSource source);
+extern void assign_debug_io_direct(const char *newval, void *extra);
 extern bool check_default_table_access_method(char **newval, void **extra,
 											  GucSource source);
 extern bool check_default_tablespace(char **newval, void **extra,
@@ -157,7 +159,5 @@ extern bool check_wal_consistency_checking(char **newval, void **extra,
 										   GucSource source);
 extern void assign_wal_consistency_checking(const char *newval, void *extra);
 extern void assign_xlog_sync_method(int new_sync_method, void *extra);
-extern bool check_io_direct(char **newval, void **extra, GucSource source);
-extern void assign_io_direct(const char *newval, void *extra);
 
 #endif							/* GUC_HOOKS_H */

Original file line number	Diff line number	Diff line change
`@@ -3886,7 +3886,7 @@ data_sync_elevel(int elevel)`
`3886`	`3886`	`}`
`3887`	`3887`
`3888`	`3888`	`bool`
`3889`		`-check_io_direct(char newval, void extra, GucSource source)`
	`3889`	`+check_debug_io_direct(char newval, void extra, GucSource source)`
`3890`	`3890`	`{`
`3891`	`3891`	`bool result = true;`
`3892`	`3892`	`int flags;`
`@@ -3960,15 +3960,15 @@ check_io_direct(char newval, void extra, GucSource source)`
`3960`	`3960`	`if (!result)`
`3961`	`3961`	`return result;`
`3962`	`3962`
`3963`		`- /* Save the flags in extra, for use by assign_io_direct /`
	`3963`	`+ /* Save the flags in extra, for use by assign_debug_io_direct /`
`3964`	`3964`	`*extra = guc_malloc(ERROR, sizeof(int));`
`3965`	`3965`	`((int ) *extra) = flags;`
`3966`	`3966`
`3967`	`3967`	`return result;`
`3968`	`3968`	`}`
`3969`	`3969`
`3970`	`3970`	`extern void`
`3971`		`-assign_io_direct(const char newval, void extra)`
	`3971`	`+assign_debug_io_direct(const char newval, void extra)`
`3972`	`3972`	`{`
`3973`	`3973`	`int flags = (int ) extra;`
`3974`	`3974`