kconfig: remove dummy assignments to cur_{filename,lineno}
PATCH 1/3 kconfig: remove dummy assignments to cur_{filename,lineno}
Since commit ca4c74ba306e ("kconfig: remove P_CHOICE property"), menu_finalize() no longer calls menu_add_symbol(). No function references cur_filename or cur_lineno after yyparse().
---
scripts/kconfig/parser.y | 8 -------- 1 file changed, 8 deletions(-)
scripts/kconfig/parser.y +0 -8
@@ -530,14 +530,6 @@ void conf_parse(const char *name) yydebug = 1; yyparse(); - /* - * FIXME: - * cur_filename and cur_lineno are used even after yyparse(); - * menu_finalize() calls menu_add_symbol(). This should be fixed. - */ - cur_filename = "<none>"; - cur_lineno = 0; - str_printf(&autoconf_cmd, "\n" "$(autoconfig): $(deps_config)\n"
Signature · 1 line
2.43.0
PATCH 2/3 kconfig: stop adding P_SYMBOL property to symbols
I believe its last usage was in the following code:
if (prop == NULL)
prop = stack->sym->prop;This code was previously used to print the file name and line number of associated symbols in sym_check_print_recursive(), which was removed by commit 9d0d26604657 ("kconfig: recursive checks drop file/lineno").
---
scripts/kconfig/menu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
scripts/kconfig/menu.c +1 -3
@@ -78,10 +78,8 @@ void menu_add_entry(struct symbol *sym) *last_entry_ptr = menu; last_entry_ptr = &menu->next; current_entry = menu; -if (sym) { -menu_add_symbol (P_SYMBOL , sym,NULL ); +if (sym)list_add_tail (&menu->link, &sym->menus); - } }struct menu *menu_add_menu (void )
Signature · 1 line
2.43.0
PATCH 3/3 kconfig: remove P_SYMBOL property
In reply to Masahiro YamadaP_SYMBOL is a pseudo property that was previously used for data linking purposes.
It is no longer used except for debug prints. Remove it.
---
scripts/kconfig/expr.h | 1 - scripts/kconfig/parser.y | 4 ---- scripts/kconfig/qconf.cc | 1 - scripts/kconfig/symbol.c | 2 -- 4 files changed, 8 deletions(-)
scripts/kconfig/expr.h +0 -1
@@ -168,7 +168,6 @@ enum prop_type {P_SELECT ,/* select BAR */ P_IMPLY ,/* imply BAR */ P_RANGE, /* range 7..100 (for a symbol) */ - P_SYMBOL, /* where a symbol is defined */ }; struct property {
scripts/kconfig/parser.y +0 -4
@@ -707,10 +707,6 @@ static void print_symbol(FILE *out, const struct menu *menu) print_quoted_string(out, prop->text); fputc('\n', out); break; - case P_SYMBOL: - fputs( " symbol ", out); - fprintf(out, "%s\n", prop->menu->sym->name); - break; default: fprintf(out, " unknown prop %d!\n", prop->type); break;
scripts/kconfig/qconf.cc +0 -1
@@ -1094,7 +1094,6 @@ QString ConfigInfoView::debug_info(struct symbol *sym) case P_RANGE: case P_COMMENT: case P_IMPLY: - case P_SYMBOL: stream << prop_get_type_name(prop->type); stream << ": "; expr_print(prop->expr, expr_print_help,
scripts/kconfig/symbol.c +0 -2
@@ -1321,8 +1321,6 @@ const char *prop_get_type_name(enum prop_type type)return "imply" ;case P_RANGE :return "range" ; -case P_SYMBOL : -return "symbol" ;case P_UNKNOWN :break ; }
Signature · 1 line
2.43.0