diff options
author | blaisorblade@yahoo.it <blaisorblade@yahoo.it> | 2005-07-28 11:56:25 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.(none)> | 2005-07-28 17:19:01 -0400 |
commit | fb7f6ff614f3ead2ca41bb4a348b9ea431d95176 (patch) | |
tree | 4f5b3edca352f764e119b1ec57f5c76f181bb05d /scripts/kconfig | |
parent | 66d609ec8a4464b5fbe7a0723e3958b98c95991a (diff) |
[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>
Diffstat (limited to 'scripts/kconfig')
-rw-r--r-- | scripts/kconfig/lkc.h | 2 | ||||
-rw-r--r-- | scripts/kconfig/menu.c | 4 | ||||
-rw-r--r-- | scripts/kconfig/zconf.tab.c_shipped | 8 | ||||
-rw-r--r-- | scripts/kconfig/zconf.y | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 8b84c42b49b5..c3d25786a64d 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h | |||
@@ -59,7 +59,7 @@ void menu_add_entry(struct symbol *sym); | |||
59 | void menu_end_entry(void); | 59 | void menu_end_entry(void); |
60 | void menu_add_dep(struct expr *dep); | 60 | void menu_add_dep(struct expr *dep); |
61 | struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep); | 61 | struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep); |
62 | void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); | 62 | struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); |
63 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); | 63 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); |
64 | void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); | 64 | void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); |
65 | void menu_finalize(struct menu *parent); | 65 | void menu_finalize(struct menu *parent); |
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index 8c59b212722d..5cfa6c405cf0 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -136,9 +136,9 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e | |||
136 | return prop; | 136 | return prop; |
137 | } | 137 | } |
138 | 138 | ||
139 | void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep) | 139 | struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep) |
140 | { | 140 | { |
141 | menu_add_prop(type, prompt, NULL, dep); | 141 | return menu_add_prop(type, prompt, NULL, dep); |
142 | } | 142 | } |
143 | 143 | ||
144 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep) | 144 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep) |
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped index f163d8d2d9ef..ff4fcc09720e 100644 --- a/scripts/kconfig/zconf.tab.c_shipped +++ b/scripts/kconfig/zconf.tab.c_shipped | |||
@@ -1531,7 +1531,7 @@ yyreduce: | |||
1531 | 1531 | ||
1532 | { | 1532 | { |
1533 | menu_add_entry(NULL); | 1533 | menu_add_entry(NULL); |
1534 | menu_add_prop(P_MENU, yyvsp[-1].string, NULL, NULL); | 1534 | menu_add_prompt(P_MENU, yyvsp[-1].string, NULL); |
1535 | printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); | 1535 | printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); |
1536 | ;} | 1536 | ;} |
1537 | break; | 1537 | break; |
@@ -1586,7 +1586,7 @@ yyreduce: | |||
1586 | 1586 | ||
1587 | { | 1587 | { |
1588 | menu_add_entry(NULL); | 1588 | menu_add_entry(NULL); |
1589 | menu_add_prop(P_COMMENT, yyvsp[-1].string, NULL, NULL); | 1589 | menu_add_prompt(P_COMMENT, yyvsp[-1].string, NULL); |
1590 | printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno()); | 1590 | printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno()); |
1591 | ;} | 1591 | ;} |
1592 | break; | 1592 | break; |
@@ -1640,7 +1640,7 @@ yyreduce: | |||
1640 | case 86: | 1640 | case 86: |
1641 | 1641 | ||
1642 | { | 1642 | { |
1643 | menu_add_prop(P_PROMPT, yyvsp[-1].string, NULL, yyvsp[0].expr); | 1643 | menu_add_prompt(P_PROMPT, yyvsp[-1].string, yyvsp[0].expr); |
1644 | ;} | 1644 | ;} |
1645 | break; | 1645 | break; |
1646 | 1646 | ||
@@ -1925,7 +1925,7 @@ void conf_parse(const char *name) | |||
1925 | sym_init(); | 1925 | sym_init(); |
1926 | menu_init(); | 1926 | menu_init(); |
1927 | modules_sym = sym_lookup("MODULES", 0); | 1927 | modules_sym = sym_lookup("MODULES", 0); |
1928 | rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL); | 1928 | rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); |
1929 | 1929 | ||
1930 | //zconfdebug = 1; | 1930 | //zconfdebug = 1; |
1931 | zconfparse(); | 1931 | zconfparse(); |
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 54460f8d3696..e1a0f455d4a8 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y | |||
@@ -342,7 +342,7 @@ if_block: | |||
342 | menu: T_MENU prompt T_EOL | 342 | menu: T_MENU prompt T_EOL |
343 | { | 343 | { |
344 | menu_add_entry(NULL); | 344 | menu_add_entry(NULL); |
345 | menu_add_prop(P_MENU, $2, NULL, NULL); | 345 | menu_add_prompt(P_MENU, $2, NULL); |
346 | printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); | 346 | printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno()); |
347 | }; | 347 | }; |
348 | 348 | ||
@@ -392,7 +392,7 @@ source_stmt: source | |||
392 | comment: T_COMMENT prompt T_EOL | 392 | comment: T_COMMENT prompt T_EOL |
393 | { | 393 | { |
394 | menu_add_entry(NULL); | 394 | menu_add_entry(NULL); |
395 | menu_add_prop(P_COMMENT, $2, NULL, NULL); | 395 | menu_add_prompt(P_COMMENT, $2, NULL); |
396 | printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno()); | 396 | printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno()); |
397 | }; | 397 | }; |
398 | 398 | ||
@@ -443,7 +443,7 @@ prompt_stmt_opt: | |||
443 | /* empty */ | 443 | /* empty */ |
444 | | prompt if_expr | 444 | | prompt if_expr |
445 | { | 445 | { |
446 | menu_add_prop(P_PROMPT, $1, NULL, $2); | 446 | menu_add_prompt(P_PROMPT, $1, $2); |
447 | }; | 447 | }; |
448 | 448 | ||
449 | prompt: T_WORD | 449 | prompt: T_WORD |
@@ -487,7 +487,7 @@ void conf_parse(const char *name) | |||
487 | sym_init(); | 487 | sym_init(); |
488 | menu_init(); | 488 | menu_init(); |
489 | modules_sym = sym_lookup("MODULES", 0); | 489 | modules_sym = sym_lookup("MODULES", 0); |
490 | rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL); | 490 | rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); |
491 | 491 | ||
492 | //zconfdebug = 1; | 492 | //zconfdebug = 1; |
493 | zconfparse(); | 493 | zconfparse(); |