kconfig: associate struct menu with file name directly

struct menu is linked to struct file for diagnostic purposes.
It is always used to retrieve the file name through menu->file->name.

Associate struct menu with the file name directly.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index e0d8665691550abb270a6592a8fd428cbb9036e0..e8fc85d98cdd61934a666a899cdef8224092fdbe 100644 (file)
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -256,7 +256,7 @@ struct menu {
        char *help;
 
        /* The location where the menu node appears in the Kconfig files */
-       struct file *file;
+       const char *filename;
        int lineno;
 
        /* For use by front ends that need to store auxiliary data */

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index ddca95879631b2db75d90e8650ab56b051b0f7bd..5ad4d2b9fb82876fc93a95d24b3ac64eb9aa771e 100644 (file)
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -23,7 +23,7 @@ void menu_warn(struct menu *menu, const char *fmt, ...)
 {
        va_list ap;
        va_start(ap, fmt);
-       fprintf(stderr, "%s:%d:warning: ", menu->file->name, menu->lineno);
+       fprintf(stderr, "%s:%d:warning: ", menu->filename, menu->lineno);
        vfprintf(stderr, fmt, ap);
        fprintf(stderr, "\n");
        va_end(ap);
@@ -53,7 +53,7 @@ void menu_add_entry(struct symbol *sym)
        memset(menu, 0, sizeof(*menu));
        menu->sym = sym;
        menu->parent = current_menu;
-       menu->file = current_file;
+       menu->filename = cur_filename;
        menu->lineno = cur_lineno;
 
        *last_entry_ptr = menu;
@@ -676,7 +676,7 @@ struct menu *menu_get_parent_menu(struct menu *menu)
 static void get_def_str(struct gstr *r, struct menu *menu)
 {
        str_printf(r, "Defined at %s:%d\n",
-                  menu->file->name, menu->lineno);
+                  menu->filename, menu->lineno);
 }
 
 static void get_dep_str(struct gstr *r, struct expr *expr, const char *prefix)

diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y
index b9d7e26fc160754f1a8e0c0eea1ad19aab5bc7de..d1d05c8cd89dbfca9dd05aea4047d0d436ee38ac 100644 (file)
--- a/scripts/kconfig/parser.y
+++ b/scripts/kconfig/parser.y
@@ -101,7 +101,7 @@ struct menu *current_menu, *current_entry;
 
 %destructor {
        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
-               $$->file->name, $$->lineno);
+               $$->filename, $$->lineno);
        if (current_menu == $$)
                menu_end_menu();
 } if_entry menu_entry choice_entry
@@ -527,11 +527,11 @@ static bool zconf_endtoken(const char *tokenname,
                yynerrs++;
                return false;
        }
-       if (current_menu->file != current_file) {
+       if (strcmp(current_menu->filename, cur_filename)) {
                zconf_error("'%s' in different file than '%s'",
                            tokenname, expected_tokenname);
                fprintf(stderr, "%s:%d: location of the '%s'\n",
-                       current_menu->file->name, current_menu->lineno,
+                       current_menu->filename, current_menu->lineno,
                        expected_tokenname);
                yynerrs++;
                return false;

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 620a3527c767af47e6cac0f36ee7533171626f2f..c6c42c0f4e5d588b49da9c38d494c57b2f4233c0 100644 (file)
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1058,7 +1058,7 @@ void ConfigInfoView::menuInfo(void)
                                stream << "<br><br>";
                        }
 
-                       stream << "defined at " << _menu->file->name << ":"
+                       stream << "defined at " << _menu->filename << ":"
                               << _menu->lineno << "<br><br>";
                }
        }

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index e9e9fb8d86746460c893a51a2989ca4061fc8e52..7647e3e87cd5ffaef90495c2c0ba2975e115918a 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1045,12 +1045,12 @@ static void sym_check_print_recursive(struct symbol *last_sym)
 
                if (sym_is_choice(sym)) {
                        fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
-                               menu->file->name, menu->lineno,
+                               menu->filename, menu->lineno,
                                sym->name ? sym->name : "<choice>",
                                next_sym->name ? next_sym->name : "<choice>");
                } else if (sym_is_choice_value(sym)) {
                        fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n",
-                               menu->file->name, menu->lineno,
+                               menu->filename, menu->lineno,
                                sym->name ? sym->name : "<choice>",
                                next_sym->name ? next_sym->name : "<choice>");
                } else if (stack->expr == &sym->dir_dep.expr) {