All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cheng Renquan <crquan@gmail.com>
To: Randy Dunlap <randy.dunlap@oracle.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	Roman Zippel <zippel@linux-m68k.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	cr_quan@163.com
Subject: [PATCH 6/6] [KBUILD] make use of menu_get_ext_help in "make config"
Date: Mon, 23 Feb 2009 23:10:04 +0800	[thread overview]
Message-ID: <1235401804-8136-7-git-send-email-crquan@gmail.com> (raw)
In-Reply-To: <1235401804-8136-6-git-send-email-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 3e1057f..8ec35c9 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -37,14 +37,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)
@@ -139,7 +139,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;
 			}
@@ -219,7 +219,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);
 	}
 }
 
@@ -306,7 +306,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])
@@ -330,7 +330,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.0.6


  reply	other threads:[~2009-02-23 15:12 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-23 15:09 [PATCH 0/6] [KBUILD] configuration system improvements Cheng Renquan
2009-02-23 15:09 ` [PATCH 1/6] [KBUILD] add symbol value to help find the real depend Cheng Renquan
2009-02-23 15:10   ` [PATCH 2/6] [KBUILD] add menu_get_ext_help function to display more information Cheng Renquan
2009-02-23 15:10     ` [PATCH 3/6] [KBUILD] menuconfig improvements Cheng Renquan
2009-02-23 15:10       ` [PATCH 4/6] [KBUILD] make use of menu_get_ext_help in gconfig Cheng Renquan
2009-02-23 15:10         ` [PATCH 5/6] [KBUILD] make use of menu_get_ext_help in qconfig Cheng Renquan
2009-02-23 15:10           ` Cheng Renquan [this message]
2009-03-02  3:42 ` [PATCH 0/6] [KBUILD] configuration system improvements Randy Dunlap
2009-03-03  4:09   ` Cheng Renquan
2009-03-03 18:24     ` Randy Dunlap
2009-03-03 19:55       ` Randy Dunlap
2009-03-04  6:50         ` Cheng Renquan
2009-03-04 17:18           ` 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=1235401804-8136-7-git-send-email-crquan@gmail.com \
    --to=crquan@gmail.com \
    --cc=cr_quan@163.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=randy.dunlap@oracle.com \
    --cc=sam@ravnborg.org \
    --cc=zippel@linux-m68k.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.