Move private declarations shared between guc.c and guc-file.l to new header

Further preparatory refactoring for compiling guc-file.c standalone.

Reviewed by Andres Freund
Discussion: https://www.postgresql.org/message-id/20220810171935.7k5zgnjwqzalzmtm%40awork3.anarazel.de
Discussion: https://www.postgresql.org/message-id/CAFBsxsF8Gc2StS3haXofshHCzqNMRXiSxvQEYGwnFsTmsdwNeg@mail.gmail.com

diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index 47d4bd18d56a4aaf6f1ded24e5a4a10a1157ab2b..8b5b299efd8c13f3b41fd848cb89a993bc39eccd 100644 (file)
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -15,10 +15,10 @@
 #include <unistd.h>
 
 #include "common/file_utils.h"
+#include "guc_internal.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "storage/fd.h"
-#include "utils/guc.h"
 
 
 /*

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 66ab3912a0e7a7a3d1c437bf22873496de621cff..0e6c13fa2a74123b5146b3d02974d92d6974795c 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -57,6 +57,7 @@
 #include "commands/variable.h"
 #include "common/string.h"
 #include "funcapi.h"
+#include "guc_internal.h"
 #include "jit/jit.h"
 #include "libpq/auth.h"
 #include "libpq/libpq.h"

diff --git a/src/backend/utils/misc/guc_internal.h b/src/backend/utils/misc/guc_internal.h
new file mode 100644 (file)index 0000000..be39409
--- /dev/null
+++ b/src/backend/utils/misc/guc_internal.h
@@ -0,0 +1,26 @@
+/*--------------------------------------------------------------------
+ * guc_internals.h
+ *
+ * Declarations shared between backend/utils/misc/guc.c and
+ * backend/utils/misc/guc-file.l
+ *
+ * Copyright (c) 2000-2022, PostgreSQL Global Development Group
+ *
+ * src/include/utils/guc_internals.h
+ *--------------------------------------------------------------------
+ */
+#ifndef GUC_INTERNALS_H
+#define GUC_INTERNALS_H
+
+#include "utils/guc.h"
+
+extern int guc_name_compare(const char *namea, const char *nameb);
+extern ConfigVariable *ProcessConfigFileInternal(GucContext context,
+                                                bool applySettings, int elevel);
+extern void record_config_file_error(const char *errmsg,
+                                    const char *config_file,
+                                    int lineno,
+                                    ConfigVariable **head_p,
+                                    ConfigVariable **tail_p);
+
+#endif                         /* GUC_INTERNALS_H */

diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index aae071cd82565dffd5ca7890f799f38fa3971668..45ae1b537f3cd781026a76ce2a2edc66f9197ad4 100644 (file)
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -442,16 +442,6 @@ extern void GUC_check_errcode(int sqlerrcode);
    pre_format_elog_string(errno, TEXTDOMAIN), \
    GUC_check_errhint_string = format_elog_string
 
-/* functions shared between guc.c and guc-file.l */
-extern int guc_name_compare(const char *namea, const char *nameb);
-extern ConfigVariable *ProcessConfigFileInternal(GucContext context,
-                                                bool applySettings, int elevel);
-extern void record_config_file_error(const char *errmsg,
-                                    const char *config_file,
-                                    int lineno,
-                                    ConfigVariable **head_p,
-                                    ConfigVariable **tail_p);
-
 /*
  * The following functions are not in guc.c, but are declared here to avoid
  * having to include guc.h in some widely used headers that it really doesn't