Skip to content

Commit e89b461

Browse files
masahir0ymasahir0y
committed
kconfig: m/nconf: remove dead code to display children of choice members
This code previously displayed child symbols of the selected choice member. Since commit 7e3465f ("kconfig: do not reparent the menu inside a choice block"), choice members never have child symbols, therefore this is dead code. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
1 parent 6ba750d commit e89b461

File tree

2 files changed

+71
-95
lines changed

2 files changed

+71
-95
lines changed

‎scripts/kconfig/mconf.c

Lines changed: 35 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -551,11 +551,6 @@ static void build_conf(struct menu *menu)
551551
if (def_menu) {
552552
item_add_str(" (%s)", menu_get_prompt(def_menu));
553553
item_add_str(" --->");
554-
if (def_menu->list) {
555-
indent += 2;
556-
build_conf(def_menu);
557-
indent -= 2;
558-
}
559554
}
560555
return;
561556
}
@@ -568,49 +563,43 @@ static void build_conf(struct menu *menu)
568563
}
569564
child_count++;
570565
val = sym_get_tristate_value(sym);
571-
if (sym_is_choice_value(sym) && val == yes) {
572-
item_make(" ");
573-
item_set_tag(':');
566+
switch (type) {
567+
case S_BOOLEAN:
568+
if (sym_is_changeable(sym))
569+
item_make("[%c]", val == no ? ' ' : '*');
570+
else
571+
item_make("-%c-", val == no ? ' ' : '*');
572+
item_set_tag('t');
574573
item_set_data(menu);
575-
} else {
576-
switch (type) {
577-
case S_BOOLEAN:
578-
if (sym_is_changeable(sym))
579-
item_make("[%c]", val == no ? ' ' : '*');
580-
else
581-
item_make("-%c-", val == no ? ' ' : '*');
582-
item_set_tag('t');
583-
item_set_data(menu);
584-
break;
585-
case S_TRISTATE:
586-
switch (val) {
587-
case yes: ch = '*'; break;
588-
case mod: ch = 'M'; break;
589-
default: ch = ' '; break;
590-
}
591-
if (sym_is_changeable(sym)) {
592-
if (sym->rev_dep.tri == mod)
593-
item_make("{%c}", ch);
594-
else
595-
item_make("<%c>", ch);
596-
} else
597-
item_make("-%c-", ch);
598-
item_set_tag('t');
599-
item_set_data(menu);
600-
break;
601-
default:
602-
tmp = 2 + strlen(sym_get_string_value(sym)); /* () = 2 */
603-
item_make("(%s)", sym_get_string_value(sym));
604-
tmp = indent - tmp + 4;
605-
if (tmp < 0)
606-
tmp = 0;
607-
item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
608-
(sym_has_value(sym) || !sym_is_changeable(sym)) ?
609-
"" : " (NEW)");
610-
item_set_tag('s');
611-
item_set_data(menu);
612-
goto conf_childs;
574+
break;
575+
case S_TRISTATE:
576+
switch (val) {
577+
case yes: ch = '*'; break;
578+
case mod: ch = 'M'; break;
579+
default: ch = ' '; break;
613580
}
581+
if (sym_is_changeable(sym)) {
582+
if (sym->rev_dep.tri == mod)
583+
item_make("{%c}", ch);
584+
else
585+
item_make("<%c>", ch);
586+
} else
587+
item_make("-%c-", ch);
588+
item_set_tag('t');
589+
item_set_data(menu);
590+
break;
591+
default:
592+
tmp = 2 + strlen(sym_get_string_value(sym)); /* () = 2 */
593+
item_make("(%s)", sym_get_string_value(sym));
594+
tmp = indent - tmp + 4;
595+
if (tmp < 0)
596+
tmp = 0;
597+
item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
598+
(sym_has_value(sym) || !sym_is_changeable(sym)) ?
599+
"" : " (NEW)");
600+
item_set_tag('s');
601+
item_set_data(menu);
602+
goto conf_childs;
614603
}
615604
item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
616605
(sym_has_value(sym) || !sym_is_changeable(sym)) ?

‎scripts/kconfig/nconf.c

Lines changed: 36 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -857,11 +857,6 @@ static void build_conf(struct menu *menu)
857857
item_add_str(" (%s)",
858858
menu_get_prompt(def_menu));
859859
item_add_str(" --->");
860-
if (def_menu->list) {
861-
indent += 2;
862-
build_conf(def_menu);
863-
indent -= 2;
864-
}
865860
}
866861
return;
867862
}
@@ -874,54 +869,46 @@ static void build_conf(struct menu *menu)
874869
}
875870
child_count++;
876871
val = sym_get_tristate_value(sym);
877-
if (sym_is_choice_value(sym) && val == yes) {
878-
item_make(menu, ':', " ");
879-
} else {
880-
switch (type) {
881-
case S_BOOLEAN:
882-
if (sym_is_changeable(sym))
883-
item_make(menu, 't', "[%c]",
884-
val == no ? ' ' : '*');
885-
else
886-
item_make(menu, 't', "-%c-",
887-
val == no ? ' ' : '*');
872+
switch (type) {
873+
case S_BOOLEAN:
874+
if (sym_is_changeable(sym))
875+
item_make(menu, 't', "[%c]",
876+
val == no ? ' ' : '*');
877+
else
878+
item_make(menu, 't', "-%c-",
879+
val == no ? ' ' : '*');
880+
break;
881+
case S_TRISTATE:
882+
switch (val) {
883+
case yes:
884+
ch = '*';
888885
break;
889-
case S_TRISTATE:
890-
switch (val) {
891-
case yes:
892-
ch = '*';
893-
break;
894-
case mod:
895-
ch = 'M';
896-
break;
897-
default:
898-
ch = ' ';
899-
break;
900-
}
901-
if (sym_is_changeable(sym)) {
902-
if (sym->rev_dep.tri == mod)
903-
item_make(menu,
904-
't', "{%c}", ch);
905-
else
906-
item_make(menu,
907-
't', "<%c>", ch);
908-
} else
909-
item_make(menu, 't', "-%c-", ch);
886+
case mod:
887+
ch = 'M';
910888
break;
911889
default:
912-
tmp = 2 + strlen(sym_get_string_value(sym));
913-
item_make(menu, 's', " (%s)",
914-
sym_get_string_value(sym));
915-
tmp = indent - tmp + 4;
916-
if (tmp < 0)
917-
tmp = 0;
918-
item_add_str("%*c%s%s", tmp, ' ',
919-
menu_get_prompt(menu),
920-
(sym_has_value(sym) ||
921-
!sym_is_changeable(sym)) ? "" :
922-
" (NEW)");
923-
goto conf_childs;
890+
ch = ' ';
891+
break;
924892
}
893+
if (sym_is_changeable(sym)) {
894+
if (sym->rev_dep.tri == mod)
895+
item_make(menu, 't', "{%c}", ch);
896+
else
897+
item_make(menu, 't', "<%c>", ch);
898+
} else
899+
item_make(menu, 't', "-%c-", ch);
900+
break;
901+
default:
902+
tmp = 2 + strlen(sym_get_string_value(sym));
903+
item_make(menu, 's', " (%s)",
904+
sym_get_string_value(sym));
905+
tmp = indent - tmp + 4;
906+
if (tmp < 0)
907+
tmp = 0;
908+
item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
909+
(sym_has_value(sym) ||
910+
!sym_is_changeable(sym)) ? "" : " (NEW)");
911+
goto conf_childs;
925912
}
926913
item_add_str("%*c%s%s", indent + 1, ' ',
927914
menu_get_prompt(menu),

0 commit comments

Comments
 (0)