From patchwork Sun Jul 10 07:27:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 960692 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6A7RMsU013897 for ; Sun, 10 Jul 2011 07:27:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755359Ab1GJH1U (ORCPT ); Sun, 10 Jul 2011 03:27:20 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:52387 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755352Ab1GJH1U (ORCPT ); Sun, 10 Jul 2011 03:27:20 -0400 Received: by iwn6 with SMTP id 6so2828374iwn.19 for ; Sun, 10 Jul 2011 00:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=v/oyKCFJLNaQH1SMFz1M+qy/9QvbFTQCnxakSzvcp8E=; b=P5IjkTSVeUtt198lZkzXWQ0p5lwO4B9hK4JElesj+xRJamOzPzKHm7RQIzwVxxg6oA 7bqfDtUoceebHfouGg+NeV8SwakJVt5b/AyVvt3WEI9NDYOTn9QzzJJROcMzPCIsd5Jg Z1L3KC8+55WPDt2GScGy114zDCV0EhdlyEOKM= Received: by 10.42.115.4 with SMTP id i4mr4036624icq.22.1310282839230; Sun, 10 Jul 2011 00:27:19 -0700 (PDT) Received: from localhost.localdomain ([184.175.3.95]) by mx.google.com with ESMTPS id s2sm12594594icw.17.2011.07.10.00.27.17 (version=SSLv3 cipher=OTHER); Sun, 10 Jul 2011 00:27:18 -0700 (PDT) From: Arnaud Lacombe To: linux-kbuild@vger.kernel.org, Michal Marek Cc: linux-kernel@vger.kernel.org, Arnaud Lacombe , Nir Tzachar , Andrej Gelenberg Subject: [PATCH 1/2] kconfig/nconf: use the generic menu_get_ext_help() Date: Sun, 10 Jul 2011 03:27:04 -0400 Message-Id: <1310282825-14509-1-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.3.4.574.g608b.dirty In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 10 Jul 2011 07:27:24 +0000 (UTC) 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 Cc: Andrej Gelenberg Signed-off-by: Arnaud Lacombe --- 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); }