[patch 1/1] kconfig: trivial cleanup

[patch 1/1] kconfig: trivial cleanup

[blaisorblade]

CC: Roman Zippel <zippel@linux-m68k.org>, <kbuild-devel@lists.sourceforge.net>

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.

Remains to rebuild scripts/kconfig/zconf.tab.c_shipped, which I didn't in this
patch because I've a different version of Bison (2.0 one) and so the patch I
get would be bigly cluttered.

If you want, I'll do one patch update the included version to 2.0 Bison (which
uses an updated skeleton) and then, separately, a patch updating
zconf.tab.c_shipped to reflect the updated zconf.y.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 linux-2.6.git-paolo/./scripts/kconfig/menu.c |    4 ++--
 linux-2.6.git-paolo/scripts/kconfig/lkc.h    |    2 +-
 linux-2.6.git-paolo/scripts/kconfig/zconf.y  |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff -puN scripts/kconfig/lkc.h~kbuild-trivial-cleanup scripts/kconfig/lkc.h
--- linux-2.6.git/scripts/kconfig/lkc.h~kbuild-trivial-cleanup	2005-05-29 19:34:19.000000000 +0200
+++ linux-2.6.git-paolo/scripts/kconfig/lkc.h	2005-05-29 19:34:19.000000000 +0200
@@ -59,7 +59,7 @@ void menu_add_entry(struct symbol *sym);
 void menu_end_entry(void);
 void menu_add_dep(struct expr *dep);
 struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep);
-void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
+struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
 void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
 void menu_finalize(struct menu *parent);
diff -puN ./scripts/kconfig/menu.c~kbuild-trivial-cleanup ./scripts/kconfig/menu.c
--- linux-2.6.git/./scripts/kconfig/menu.c~kbuild-trivial-cleanup	2005-05-29 19:34:19.000000000 +0200
+++ linux-2.6.git-paolo/./scripts/kconfig/menu.c	2005-05-29 19:34:19.000000000 +0200
@@ -136,9 +136,9 @@ struct property *menu_add_prop(enum prop
 	return prop;
 }
 
-void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep)
+struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep)
 {
-	menu_add_prop(type, prompt, NULL, dep);
+	return menu_add_prop(type, prompt, NULL, dep);
 }
 
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep)
diff -puN scripts/kconfig/zconf.y~kbuild-trivial-cleanup scripts/kconfig/zconf.y
--- linux-2.6.git/scripts/kconfig/zconf.y~kbuild-trivial-cleanup	2005-05-29 19:34:19.000000000 +0200
+++ linux-2.6.git-paolo/scripts/kconfig/zconf.y	2005-05-29 19:34:19.000000000 +0200
@@ -342,7 +342,7 @@ if_block:
 menu: T_MENU prompt T_EOL
 {
 	menu_add_entry(NULL);
-	menu_add_prop(P_MENU, $2, NULL, NULL);
+	menu_add_prompt(P_MENU, $2, NULL);
 	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 };
 
@@ -392,7 +392,7 @@ source_stmt: source
 comment: T_COMMENT prompt T_EOL
 {
 	menu_add_entry(NULL);
-	menu_add_prop(P_COMMENT, $2, NULL, NULL);
+	menu_add_prompt(P_COMMENT, $2, NULL);
 	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 };
 
@@ -443,7 +443,7 @@ prompt_stmt_opt:
 	  /* empty */
 	| prompt if_expr
 {
-	menu_add_prop(P_PROMPT, $1, NULL, $2);
+	menu_add_prompt(P_PROMPT, $1, $2);
 };
 
 prompt:	  T_WORD
@@ -487,7 +487,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();
_

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

[Roman Zippel]

Hi,

On Sun, 29 May 2005 blaisorblade@yahoo.it wrote:

> If you want, I'll do one patch update the included version to 2.0 Bison (which
> uses an updated skeleton) and then, separately, a patch updating
> zconf.tab.c_shipped to reflect the updated zconf.y.

I'd prefer to patch the changes into zconf.tab.c_shipped directly. At some 
point it should be regenerated, but I'd like to avoid it and only do it if 
the parser itself needs a change.

bye, Roman

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

[Blaisorblade]

On Tuesday 31 May 2005 11:27, Roman Zippel wrote:
> Hi,
>
> On Sun, 29 May 2005 blaisorblade@yahoo.it wrote:
> > If you want, I'll do one patch update the included version to 2.0 Bison
> > (which uses an updated skeleton) and then, separately, a patch updating
> > zconf.tab.c_shipped to reflect the updated zconf.y.

> I'd prefer to patch the changes into zconf.tab.c_shipped directly. At some
> point it should be regenerated, but I'd like to avoid it and only do it if
> the parser itself needs a change.
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.
-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

		
___________________________________ 
Yahoo! Messenger: chiamate gratuite in tutto il mondo 
http://it.beta.messenger.yahoo.com

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

[Roman Zippel]

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

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

[Blaisorblade]

On Wednesday 01 June 2005 01:50, Roman Zippel wrote:
> 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:
Ok, yes... akpm, can you merge it?
> 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

-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it

[patch 1/1] kconfig: trivial cleanup

[blaisorblade]

CC: Roman Zippel <zippel@linux-m68k.org>, <kbuild-devel@lists.sourceforge.net>

Replace a menu_add_prop mimicking menu_add_prompt with the latter.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 linux-2.6.11-paolo/scripts/kconfig/zconf.y |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN scripts/kconfig/zconf.y~kbuild-cleanup scripts/kconfig/zconf.y
--- linux-2.6.11/scripts/kconfig/zconf.y~kbuild-cleanup	2005-03-22 17:34:36.000000000 +0100
+++ linux-2.6.11-paolo/scripts/kconfig/zconf.y	2005-03-22 17:35:14.000000000 +0100
@@ -443,7 +443,7 @@ prompt_stmt_opt:
 	  /* empty */
 	| prompt if_expr
 {
-	menu_add_prop(P_PROMPT, $1, NULL, $2);
+	menu_add_prompt(P_PROMPT, $1, $2);
 };
 
 prompt:	  T_WORD
_

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

[Roman Zippel]

Hi,

On Tue, 22 Mar 2005 blaisorblade@yahoo.it wrote:

> Replace a menu_add_prop mimicking menu_add_prompt with the latter.
> 
> Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
> ---
> 
>  linux-2.6.11-paolo/scripts/kconfig/zconf.y |    2 +-
>  1 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN scripts/kconfig/zconf.y~kbuild-cleanup scripts/kconfig/zconf.y
> --- linux-2.6.11/scripts/kconfig/zconf.y~kbuild-cleanup	2005-03-22 17:34:36.000000000 +0100
> +++ linux-2.6.11-paolo/scripts/kconfig/zconf.y	2005-03-22 17:35:14.000000000 +0100
> @@ -443,7 +443,7 @@ prompt_stmt_opt:
>  	  /* empty */
>  	| prompt if_expr
>  {
> -	menu_add_prop(P_PROMPT, $1, NULL, $2);
> +	menu_add_prompt(P_PROMPT, $1, $2);
>  };
>  

If you change this, then please do it completely. All other remaining 
menu_add_prop in that can be changed to menu_add_prompt too and the same 
change needs to be done to zconf.tab.c_shipped.

bye, Roman