From: Cheng Renquan <crq@kernel.org>
To: linux-kbuild@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, crquan@gmail.com
Subject: [PATCH 6/6] make use of menu_get_ext_help in "make config"
Date: Sun, 12 Jul 2009 16:11:48 +0800 [thread overview]
Message-ID: <1247386308-19628-7-git-send-email-crq@kernel.org> (raw)
In-Reply-To: <1247386308-19628-6-git-send-email-crq@kernel.org>
From: Cheng Renquan <crquan@gmail.com>
Signed-off-by: Cheng Renquan <crquan@gmail.com>
---
scripts/kconfig/conf.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 3baaaec..5de3303 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -38,14 +38,14 @@ static int conf_cnt;
static char line[128];
static struct menu *rootEntry;
-static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
-
-static const char *get_help(struct menu *menu)
+static void print_help(struct menu *menu)
{
- if (menu_has_help(menu))
- return _(menu_get_help(menu));
- else
- return nohelp_text;
+ struct gstr help = str_new();
+
+ menu_get_ext_help(menu, &help);
+
+ printf("\n%s\n", str_get(&help));
+ str_free(&help);
}
static void strip(char *str)
@@ -140,7 +140,7 @@ int conf_string(struct menu *menu)
case '?':
/* print help */
if (line[1] == '\n') {
- printf("\n%s\n", get_help(menu));
+ print_help(menu);
def = NULL;
break;
}
@@ -220,7 +220,7 @@ static int conf_sym(struct menu *menu)
if (sym_set_tristate_value(sym, newval))
return 0;
help:
- printf("\n%s\n", get_help(menu));
+ print_help(menu);
}
}
@@ -307,7 +307,7 @@ static int conf_choice(struct menu *menu)
fgets(line, 128, stdin);
strip(line);
if (line[0] == '?') {
- printf("\n%s\n", get_help(menu));
+ print_help(menu);
continue;
}
if (!line[0])
@@ -331,7 +331,7 @@ static int conf_choice(struct menu *menu)
if (!child)
continue;
if (line[strlen(line) - 1] == '?') {
- printf("\n%s\n", get_help(child));
+ print_help(child);
continue;
}
sym_set_choice_value(sym, child->sym);
--
1.6.3.3
next prev parent reply other threads:[~2009-07-12 8:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-12 8:11 [PATCH 0/6] kbuild configuration system improvements Cheng Renquan
2009-07-12 8:11 ` [PATCH 1/6] add symbol value to help find the real depend Cheng Renquan
2009-07-12 8:11 ` [PATCH 2/6] add menu_get_ext_help function to display more information Cheng Renquan
2009-07-12 8:11 ` [PATCH 3/6] menuconfig improvements Cheng Renquan
2009-07-12 8:11 ` [PATCH 4/6] make use of menu_get_ext_help in gconfig Cheng Renquan
2009-07-12 8:11 ` [PATCH 5/6] make use of menu_get_ext_help in qconfig Cheng Renquan
2009-07-12 8:11 ` Cheng Renquan [this message]
2009-07-12 10:00 ` [PATCH 1/6] add symbol value to help find the real depend Mikael Pettersson
2009-07-12 17:14 ` Cheng Renquan
2009-07-18 7:21 ` [PATCH 0/6] kbuild configuration system improvements Sam Ravnborg
2009-07-18 10:47 ` Cheng Renquan
2009-07-22 20:43 ` Randy Dunlap
2009-07-22 21:48 ` Sam Ravnborg
2009-07-23 0:12 ` Randy Dunlap
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=1247386308-19628-7-git-send-email-crq@kernel.org \
--to=crq@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=crquan@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.org \
/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