[PATCH] kconfig: trivial cleanup
Replace all menu_add_prop mimicking menu_add_prompt with the latter func. I've had to add a return value to menu_add_prompt for one usage. I've rebuilt scripts/kconfig/zconf.tab.c_shipped by hand to reflect changes in the source (I've not the same Bison version so regenerating it wouldn't have been not a good idea), and compared it with what Roman itself did some time ago, and it's the same. So I guess this can be finally merged. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:

committed by
Sam Ravnborg

부모
66d609ec8a
커밋
fb7f6ff614
@@ -1531,7 +1531,7 @@ yyreduce:
|
||||
|
||||
{
|
||||
menu_add_entry(NULL);
|
||||
menu_add_prop(P_MENU, yyvsp[-1].string, NULL, NULL);
|
||||
menu_add_prompt(P_MENU, yyvsp[-1].string, NULL);
|
||||
printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
|
||||
;}
|
||||
break;
|
||||
@@ -1586,7 +1586,7 @@ yyreduce:
|
||||
|
||||
{
|
||||
menu_add_entry(NULL);
|
||||
menu_add_prop(P_COMMENT, yyvsp[-1].string, NULL, NULL);
|
||||
menu_add_prompt(P_COMMENT, yyvsp[-1].string, NULL);
|
||||
printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
|
||||
;}
|
||||
break;
|
||||
@@ -1640,7 +1640,7 @@ yyreduce:
|
||||
case 86:
|
||||
|
||||
{
|
||||
menu_add_prop(P_PROMPT, yyvsp[-1].string, NULL, yyvsp[0].expr);
|
||||
menu_add_prompt(P_PROMPT, yyvsp[-1].string, yyvsp[0].expr);
|
||||
;}
|
||||
break;
|
||||
|
||||
@@ -1925,7 +1925,7 @@ void conf_parse(const char *name)
|
||||
sym_init();
|
||||
menu_init();
|
||||
modules_sym = sym_lookup("MODULES", 0);
|
||||
rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL);
|
||||
rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
|
||||
|
||||
//zconfdebug = 1;
|
||||
zconfparse();
|
||||
|
Reference in New Issue
Block a user