kconfig: associate struct property with file name directly

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

Associate struct property 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 e8fc85d98cdd61934a666a899cdef8224092fdbe..037db39c5bf0117df4ac7fc58b1ba799df097c30 100644 (file)
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -195,7 +195,7 @@ struct property {
        struct menu *menu;         /* the menu the property are associated with
                                    * valid for: P_SELECT, P_RANGE, P_CHOICE,
                                    * P_PROMPT, P_DEFAULT, P_MENU, P_COMMENT */
-       struct file *file;         /* what file was this property defined */
+       const char *filename;      /* what file was this property defined */
        int lineno;                /* what lineno was this property defined */
 };
 

diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 5ad4d2b9fb82876fc93a95d24b3ac64eb9aa771e..0ded0b1830d0eae9edfab48e829dc799cb4cc1bd 100644 (file)
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -33,7 +33,7 @@ static void prop_warn(struct property *prop, const char *fmt, ...)
 {
        va_list ap;
        va_start(ap, fmt);
-       fprintf(stderr, "%s:%d:warning: ", prop->file->name, prop->lineno);
+       fprintf(stderr, "%s:%d:warning: ", prop->filename, prop->lineno);
        vfprintf(stderr, fmt, ap);
        fprintf(stderr, "\n");
        va_end(ap);
@@ -134,7 +134,7 @@ static struct property *menu_add_prop(enum prop_type type, struct expr *expr,
        prop = xmalloc(sizeof(*prop));
        memset(prop, 0, sizeof(*prop));
        prop->type = type;
-       prop->file = current_file;
+       prop->filename = cur_filename;
        prop->lineno = cur_lineno;
        prop->menu = current_entry;
        prop->expr = expr;

diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 7647e3e87cd5ffaef90495c2c0ba2975e115918a..dae630a74e50eb433c1b4ff22024bb7531364336 100644 (file)
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1041,7 +1041,7 @@ static void sym_check_print_recursive(struct symbol *last_sym)
                }
                if (stack->sym == last_sym)
                        fprintf(stderr, "%s:%d:error: recursive dependency detected!\n",
-                               prop->file->name, prop->lineno);
+                               prop->filename, prop->lineno);
 
                if (sym_is_choice(sym)) {
                        fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
@@ -1055,28 +1055,28 @@ static void sym_check_print_recursive(struct symbol *last_sym)
                                next_sym->name ? next_sym->name : "<choice>");
                } else if (stack->expr == &sym->dir_dep.expr) {
                        fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n",
-                               prop->file->name, prop->lineno,
+                               prop->filename, prop->lineno,
                                sym->name ? sym->name : "<choice>",
                                next_sym->name ? next_sym->name : "<choice>");
                } else if (stack->expr == &sym->rev_dep.expr) {
                        fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n",
-                               prop->file->name, prop->lineno,
+                               prop->filename, prop->lineno,
                                sym->name ? sym->name : "<choice>",
                                next_sym->name ? next_sym->name : "<choice>");
                } else if (stack->expr == &sym->implied.expr) {
                        fprintf(stderr, "%s:%d:\tsymbol %s is implied by %s\n",
-                               prop->file->name, prop->lineno,
+                               prop->filename, prop->lineno,
                                sym->name ? sym->name : "<choice>",
                                next_sym->name ? next_sym->name : "<choice>");
                } else if (stack->expr) {
                        fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
-                               prop->file->name, prop->lineno,
+                               prop->filename, prop->lineno,
                                sym->name ? sym->name : "<choice>",
                                prop_get_type_name(prop->type),
                                next_sym->name ? next_sym->name : "<choice>");
                } else {
                        fprintf(stderr, "%s:%d:\tsymbol %s %s is visible depending on %s\n",
-                               prop->file->name, prop->lineno,
+                               prop->filename, prop->lineno,
                                sym->name ? sym->name : "<choice>",
                                prop_get_type_name(prop->type),
                                next_sym->name ? next_sym->name : "<choice>");