Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb7f6ff6 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Sam Ravnborg
Browse files

[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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 66d609ec

scripts/kconfig/lkc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ void menu_add_entry(struct symbol *sym); 
void menu_end_entry(void);

void menu_end_entry(void);

void menu_add_dep(struct expr *dep);

void menu_add_dep(struct expr *dep);

struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, 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_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_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);

void menu_finalize(struct menu *parent);

void menu_finalize(struct menu *parent);

scripts/kconfig/menu.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -136,9 +136,9 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e 
	return 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)

void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep)

scripts/kconfig/zconf.tab.c_shipped

+4 −4
Original line number Original line Diff line number Diff line
@@ -1531,7 +1531,7 @@ yyreduce: 




    {

    {

	menu_add_entry(NULL);

	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());

	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());

;}

;}

    break;

    break;
@@ -1586,7 +1586,7 @@ yyreduce: 




    {

    {

	menu_add_entry(NULL);

	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());

	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());

;}

;}

    break;

    break;
@@ -1640,7 +1640,7 @@ yyreduce: 
  case 86:

  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;

    break;
@@ -1925,7 +1925,7 @@ void conf_parse(const char *name) 
	sym_init();

	sym_init();

	menu_init();

	menu_init();

	modules_sym = sym_lookup("MODULES", 0);

	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;

	//zconfdebug = 1;

	zconfparse();

	zconfparse();

scripts/kconfig/zconf.y

+4 −4
Original line number Original line Diff line number Diff line
@@ -342,7 +342,7 @@ if_block: 
menu: T_MENU prompt T_EOL

menu: T_MENU prompt T_EOL

{

{

	menu_add_entry(NULL);

	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());

	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());

};

};
@@ -392,7 +392,7 @@ source_stmt: source 
comment: T_COMMENT prompt T_EOL

comment: T_COMMENT prompt T_EOL

{

{

	menu_add_entry(NULL);

	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());

	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());

};

};
@@ -443,7 +443,7 @@ prompt_stmt_opt: 
	  /* empty */

	  /* empty */

	| prompt if_expr

	| prompt if_expr

{

{

	menu_add_prop(P_PROMPT, $1, NULL, $2);

	menu_add_prompt(P_PROMPT, $1, $2);

};

};





prompt:	  T_WORD

prompt:	  T_WORD
@@ -487,7 +487,7 @@ void conf_parse(const char *name) 
	sym_init();

	sym_init();

	menu_init();

	menu_init();

	modules_sym = sym_lookup("MODULES", 0);

	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;

	//zconfdebug = 1;

	zconfparse();

	zconfparse();