[PATCH 08/27] kconfig: split preprocessor prototypes into preprocess.h

From: Masahiro Yamada
Date: Fri Feb 02 2024 - 11:01:06 EST


These are needed only for the parse stage. Move the prototypes into
a separate header to make sure they are not used after that.

Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
---

scripts/kconfig/lexer.l | 2 ++
scripts/kconfig/lkc_proto.h | 13 -------------
scripts/kconfig/parser.y | 1 +
scripts/kconfig/preprocess.c | 1 +
scripts/kconfig/preprocess.h | 19 +++++++++++++++++++
5 files changed, 23 insertions(+), 13 deletions(-)
create mode 100644 scripts/kconfig/preprocess.h

diff --git a/scripts/kconfig/lexer.l b/scripts/kconfig/lexer.l
index 5f1bc3320307..1bb372868ecf 100644
--- a/scripts/kconfig/lexer.l
+++ b/scripts/kconfig/lexer.l
@@ -14,6 +14,8 @@
#include <string.h>

#include "lkc.h"
+#include "preprocess.h"
+
#include "parser.tab.h"

#define YY_DECL static int yylex1(void)
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 85491d74a094..94299e42402f 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -40,19 +40,6 @@ const char * sym_get_string_value(struct symbol *sym);

const char * prop_get_type_name(enum prop_type type);

-/* preprocess.c */
-enum variable_flavor {
- VAR_SIMPLE,
- VAR_RECURSIVE,
- VAR_APPEND,
-};
-void env_write_dep(struct gstr *gs);
-void variable_add(const char *name, const char *value,
- enum variable_flavor flavor);
-void variable_all_del(void);
-char *expand_dollar(const char **str);
-char *expand_one_token(const char **str);
-
/* expr.c */
void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken);

diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
index cfb82ba09037..ff68def09a2b 100644
--- a/scripts/kconfig/parser.y
+++ b/scripts/kconfig/parser.y
@@ -13,6 +13,7 @@

#include "lkc.h"
#include "internal.h"
+#include "preprocess.h"

#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)

diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
index b9853d4a891c..12665b981c3e 100644
--- a/scripts/kconfig/preprocess.c
+++ b/scripts/kconfig/preprocess.c
@@ -11,6 +11,7 @@

#include "list.h"
#include "lkc.h"
+#include "preprocess.h"

#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

diff --git a/scripts/kconfig/preprocess.h b/scripts/kconfig/preprocess.h
new file mode 100644
index 000000000000..a7e4a550638c
--- /dev/null
+++ b/scripts/kconfig/preprocess.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef PREPROCESS_H
+#define PREPROCESS_H
+
+enum variable_flavor {
+ VAR_SIMPLE,
+ VAR_RECURSIVE,
+ VAR_APPEND,
+};
+
+struct gstr;
+void env_write_dep(struct gstr *gs);
+void variable_add(const char *name, const char *value,
+ enum variable_flavor flavor);
+void variable_all_del(void);
+char *expand_dollar(const char **str);
+char *expand_one_token(const char **str);
+
+#endif /* PREPROCESS_H */
--
2.40.1