Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-03 19:55:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kconfig: associate struct menu with file name directly

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2024-02-03 00:58:09 +09:00
parent 1d7c4f10ba
commit 40bab83a65
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/kconfig/expr.h
View File

@ -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 */

6
scripts/kconfig/menu.c
View File

@ -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)

6
scripts/kconfig/parser.y
View File

@ -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;

2
scripts/kconfig/qconf.cc
View File

@ -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>";
}
}

4
scripts/kconfig/symbol.c
View File

@ -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) {