From: Arnaud Lacombe <lacombar@gmail.com>
To: linux-kbuild@vger.kernel.org, Michal Marek <mmarek@suse.cz>
Cc: linux-kernel@vger.kernel.org, Arnaud Lacombe <lacombar@gmail.com>,
Nir Tzachar <nir.tzachar@gmail.com>,
Andrej Gelenberg <andrej.gelenberg@udo.edu>
Subject: [PATCH 1/2] kconfig/nconf: use the generic menu_get_ext_help()
Date: Sun, 10 Jul 2011 03:27:04 -0400 [thread overview]
Message-ID: <1310282825-14509-1-git-send-email-lacombar@gmail.com> (raw)
In-Reply-To: <CACqU3MXvHR0v4Hgn5UMwDtzaX5nWqmKEneN_s7r4PuEGzifauw@mail.gmail.com>
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>
---
scripts/kconfig/nconf.c | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index da9f5c4..24fc79a 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -1223,19 +1223,7 @@ static void conf_message_callback(const char *fmt, va_list ap)
static void show_help(struct menu *menu)
{
struct gstr help = str_new();
-
- if (menu && menu->sym && menu_has_help(menu)) {
- if (menu->sym->name) {
- str_printf(&help, "%s%s:\n\n", CONFIG_, menu->sym->name);
- str_append(&help, _(menu_get_help(menu)));
- str_append(&help, "\n");
- get_symbol_str(&help, menu->sym);
- } else {
- str_append(&help, _(menu_get_help(menu)));
- }
- } else {
- str_append(&help, nohelp_text);
- }
+ menu_get_ext_help(menu, &help);
show_scroll_win(main_window, _(menu_get_prompt(menu)), str_get(&help));
str_free(&help);
}
--
1.7.3.4.574.g608b.dirty
next prev parent reply other threads:[~2011-07-10 7:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-10 2:04 [PATCH] nconfig: prevent segfault on empty menu Andrej Gelenberg
2011-07-10 6:02 ` Arnaud Lacombe
2011-07-10 7:27 ` Arnaud Lacombe [this message]
2011-07-10 7:27 ` [PATCH 2/2] kconfig/nconf: " Arnaud Lacombe
2011-07-10 10:32 ` Nir Tzachar
2011-07-10 16:18 ` Arnaud Lacombe
2011-07-11 6:19 ` Nir Tzachar
2011-07-11 8:51 ` Andrej Gelenberg
2011-07-11 9:50 ` Nir Tzachar
2011-07-12 20:17 ` Andrej Gelenberg
2011-07-12 20:49 ` Arnaud Lacombe
2011-07-13 11:49 ` Michal Marek
2011-07-18 18:11 ` [PATCH 1/2] kconfig/nconf: use the generic menu_get_ext_help() Arnaud Lacombe
2011-07-18 19:02 ` Arnaud Lacombe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310282825-14509-1-git-send-email-lacombar@gmail.com \
--to=lacombar@gmail.com \
--cc=andrej.gelenberg@udo.edu \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=nir.tzachar@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox