kconfig: m/nconf: remove dead code to display children of choice members
PATCH v2 1/3 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 7e3465f63a0a ("kconfig: do not reparent the menu inside a choice block"), choice members never have child symbols, therefore this is dead code.
---
Changes in v2:
- Remove more dead code
scripts/kconfig/mconf.c | 81 +++++++++++++++++---------------------- scripts/kconfig/nconf.c | 85 +++++++++++++++++------------------------ 2 files changed, 71 insertions(+), 95 deletions(-)
scripts/kconfig/mconf.c +35 -46
@@ -551,11 +551,6 @@ static void build_conf(struct menu *menu)if (def_menu) {item_add_str (" (%s)" ,menu_get_prompt (def_menu));item_add_str (" --->" ); -if (def_menu->list) { - indent +=2 ; -build_conf (def_menu); - indent -=2 ; - } }return ; }
@@ -568,49 +563,43 @@ static void build_conf(struct menu *menu) } child_count++; val =sym_get_tristate_value (sym); -if (sym_is_choice_value (sym) && val == yes) { -item_make (" " ); -item_set_tag (':' ); +switch (type) { +case S_BOOLEAN : +if (sym_is_changeable (sym)) +item_make ("[%c]" , val == no ?' ' :'*' ); +else +item_make ("-%c-" , val == no ?' ' :'*' ); +item_set_tag ('t' );item_set_data (menu); - }else { -switch (type) { -case S_BOOLEAN : -if (sym_is_changeable (sym)) -item_make ("[%c]" , val == no ?' ' :'*' ); -else -item_make ("-%c-" , val == no ?' ' :'*' ); -item_set_tag ('t' ); -item_set_data (menu); -break ; -case S_TRISTATE : -switch (val) { -case yes: ch ='*' ;break ; -case mod: ch ='M' ;break ; -default : ch =' ' ;break ; - } -if (sym_is_changeable (sym)) { -if (sym->rev_dep.tri == mod) -item_make ("{%c}" , ch); -else -item_make ("<%c>" , ch); - }else -item_make ("-%c-" , ch); -item_set_tag ('t' ); -item_set_data (menu); -break ; -default : - tmp =2 +strlen (sym_get_string_value (sym));/* () = 2 */ -item_make ("(%s)" ,sym_get_string_value (sym)); - tmp = indent - tmp +4 ; -if (tmp <0 ) - tmp =0 ; -item_add_str ("%*c%s%s" , tmp,' ' ,menu_get_prompt (menu), - (sym_has_value (sym) || !sym_is_changeable (sym)) ? -"" :" (NEW)" ); -item_set_tag ('s' ); -item_set_data (menu); - goto conf_childs; +break ; +case S_TRISTATE : +switch (val) { +case yes: ch ='*' ;break ; +case mod: ch ='M' ;break ; +default : ch =' ' ;break ; } +if (sym_is_changeable (sym)) { +if (sym->rev_dep.tri == mod) +item_make ("{%c}" , ch); +else +item_make ("<%c>" , ch); + }else +item_make ("-%c-" , ch); +item_set_tag ('t' ); +item_set_data (menu); +break ; +default : + tmp =2 +strlen (sym_get_string_value (sym));/* () = 2 */ +item_make ("(%s)" ,sym_get_string_value (sym)); + tmp = indent - tmp +4 ; +if (tmp <0 ) + tmp =0 ; +item_add_str ("%*c%s%s" , tmp,' ' ,menu_get_prompt (menu), + (sym_has_value (sym) || !sym_is_changeable (sym)) ? +"" :" (NEW)" ); +item_set_tag ('s' ); +item_set_data (menu); + goto conf_childs; } item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu), (sym_has_value(sym) || !sym_is_changeable(sym)) ?
scripts/kconfig/nconf.c +36 -49
101 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v2 2/3 kconfig: m/nconf: remove dead code to display value of bool choice
Previously, optional bool choices met the following conditions simultaneously:
- sym_is_choice(sym)
- sym_is_changeable(sym)
- type == S_BOOLEAN
It no longer occurs since 6a1215888e23 ("kconfig: remove 'optional' property support"). Remove the dead code.
---
(no changes since v1)
scripts/kconfig/mconf.c | 17 +++++------------ scripts/kconfig/nconf.c | 26 +++++++++----------------- 2 files changed, 14 insertions(+), 29 deletions(-)
scripts/kconfig/mconf.c +5 -12
@@ -525,19 +525,12 @@ static void build_conf(struct menu *menu) val =sym_get_tristate_value (sym);if (sym_is_changeable (sym)) { -switch (type) { -case S_BOOLEAN : -item_make ("[%c]" , val == no ?' ' :'*' ); -break ; -case S_TRISTATE : -switch (val) { -case yes: ch ='*' ;break ; -case mod: ch ='M' ;break ; -default : ch =' ' ;break ; - } -item_make ("<%c>" , ch); -break ; +switch (val) { +case yes: ch ='*' ;break ; +case mod: ch ='M' ;break ; +default : ch =' ' ;break ; } +item_make ("<%c>" , ch);item_set_tag ('t' );item_set_data (menu); }else {
scripts/kconfig/nconf.c +9 -17
@@ -826,26 +826,18 @@ static void build_conf(struct menu *menu) val =sym_get_tristate_value (sym);if (sym_is_changeable (sym)) { -switch (type) { -case S_BOOLEAN : -item_make (menu,'t' ,"[%c]" , - val == no ?' ' :'*' ); +switch (val) { +case yes: + ch ='*' ;break ; -case S_TRISTATE : -switch (val) { -case yes: - ch ='*' ; -break ; -case mod: - ch ='M' ; -break ; -default : - ch =' ' ; -break ; - } -item_make (menu,'t' ,"<%c>" , ch); +case mod: + ch ='M' ; +break ; +default : + ch =' ' ;break ; } +item_make (menu,'t' ,"<%c>" , ch); }else {item_make (menu, def_menu ?'t' :':' ," " ); }
Signature · 1 line
2.40.1
PATCH v2 3/3 kconfig: m/nconf: merge two item_add_str() calls
In reply to Masahiro YamadaJust trivial cleanups.
---
(no changes since v1)
scripts/kconfig/mconf.c | 6 ++---- scripts/kconfig/nconf.c | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-)
scripts/kconfig/mconf.c +2 -4
@@ -541,10 +541,8 @@ static void build_conf(struct menu *menu)item_add_str ("%*c%s" , indent +1 ,' ' ,menu_get_prompt (menu));if (val == yes) { -if (def_menu) { -item_add_str (" (%s)" ,menu_get_prompt (def_menu)); -item_add_str (" --->" ); - } +if (def_menu) +item_add_str (" (%s) --->" ,menu_get_prompt (def_menu));return ; } }else {
scripts/kconfig/nconf.c +2 -5
@@ -845,11 +845,8 @@ static void build_conf(struct menu *menu)item_add_str ("%*c%s" , indent +1 ,' ' ,menu_get_prompt (menu));if (val == yes) { -if (def_menu) { -item_add_str (" (%s)" , -menu_get_prompt (def_menu)); -item_add_str (" --->" ); - } +if (def_menu) +item_add_str (" (%s) --->" ,menu_get_prompt (def_menu));return ; } }else {
Signature · 1 line
2.40.1