From patchwork Sun Jul 12 08:11:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng Renquan X-Patchwork-Id: 35241 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6C8DM4l009372 for ; Sun, 12 Jul 2009 08:13:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753090AbZGLIMh (ORCPT ); Sun, 12 Jul 2009 04:12:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752649AbZGLIMg (ORCPT ); Sun, 12 Jul 2009 04:12:36 -0400 Received: from hera.kernel.org ([140.211.167.34]:53915 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753057AbZGLIM3 (ORCPT ); Sun, 12 Jul 2009 04:12:29 -0400 Received: from hera.kernel.org (IDENT:U2FsdGVkX19nXwHdUPLzA/V3cHUsniomhbV3TMnKE+o@localhost [127.0.0.1]) by hera.kernel.org (8.14.2/8.14.2) with ESMTP id n6C8Br2W019717 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 12 Jul 2009 08:11:53 GMT Received: (from crq@localhost) by hera.kernel.org (8.14.2/8.13.1/Submit) id n6C8BqLM019716; Sun, 12 Jul 2009 16:11:52 +0800 From: Cheng Renquan To: linux-kbuild@vger.kernel.org, Sam Ravnborg Cc: Andrew Morton , 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 Message-Id: <1247386308-19628-7-git-send-email-crq@kernel.org> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1247386308-19628-6-git-send-email-crq@kernel.org> References: <1247386308-19628-1-git-send-email-crq@kernel.org> <1247386308-19628-2-git-send-email-crq@kernel.org> <1247386308-19628-3-git-send-email-crq@kernel.org> <1247386308-19628-4-git-send-email-crq@kernel.org> <1247386308-19628-5-git-send-email-crq@kernel.org> <1247386308-19628-6-git-send-email-crq@kernel.org> X-Virus-Scanned: ClamAV 0.93.3/9555/Sat Jul 11 08:31:19 2009 on hera.kernel.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on hera.kernel.org X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Sun, 12 Jul 2009 08:11:53 +0000 (UTC) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Cheng Renquan Signed-off-by: Cheng Renquan --- 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);