Eric Lee / linux-smarc-t335x-v3.2

1
Download as
Browse Code ยป

Commit 5416857867c9cc94aba641898c567d9707de30f1

Authored by Arnaud Lacombe
Committed by Michal Marek
1 parent e9882ac0e5
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

kconfig/nconf: use the generic menu_get_ext_help() 

nconf is the only front-end which does not use this helper, but prefer
to copy/paste the code. The test wrt. menu validity added in this
version of the code is bogus anyway as an invalid menu will get
dereferenced a few line below by calling menu_get_prompt().

For now, convert nconf to use menu_get_ext_help(), as do every other
front-end. We will deals with menu validity checks properly in a
separate commit.

Cc: Nir Tzachar <nir.tzachar@gmail.com>
Cc: Andrej Gelenberg <andrej.gelenberg@udo.edu>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>

Showing 1 changed file with 1 additions and 13 deletions Side-by-side Diff

scripts/kconfig/nconf.c
Diff comments   View file @ 5416857
... ... @@ -1221,19 +1221,7 @@
1221 1221 static void show_help(struct menu *menu)
1222 1222 {
1223 1223 struct gstr help = str_new();
1224   -
1225   - if (menu && menu->sym && menu_has_help(menu)) {
1226   - if (menu->sym->name) {
1227   - str_printf(&help, "%s%s:\n\n", CONFIG_, menu->sym->name);
1228   - str_append(&help, _(menu_get_help(menu)));
1229   - str_append(&help, "\n");
1230   - get_symbol_str(&help, menu->sym);
1231   - } else {
1232   - str_append(&help, _(menu_get_help(menu)));
1233   - }
1234   - } else {
1235   - str_append(&help, nohelp_text);
1236   - }
  1224 + menu_get_ext_help(menu, &help);
1237 1225 show_scroll_win(main_window, _(menu_get_prompt(menu)), str_get(&help));
1238 1226 str_free(&help);
1239 1227 }