Re: [patch 1/1] kconfig: trivial cleanup

[Roman Zippel <zippel@linux-m68k.org>]

Hi,

On Tue, 31 May 2005, Blaisorblade wrote:

> I can regenerate it only with bison 2.0, since that's what I have installed. 
> So if you don't want it to be regenerated, you cannot accept my patch. I 
> proposed sending two patches to avoid mixing the bison changes with this 
> patch changes, that's all.

What I meant is a patch like this:

Index: linux-2.6-mm/scripts/kconfig/zconf.tab.c_shipped
===================================================================
--- linux-2.6-mm.orig/scripts/kconfig/zconf.tab.c_shipped	2005-03-16 13:47:36.000000000 +0100
+++ linux-2.6-mm/scripts/kconfig/zconf.tab.c_shipped	2005-06-01 01:48:19.000000000 +0200
@@ -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();

bye, Roman