From: Arnaud Lacombe <lacombar@gmail.com>
To: Michal Marek <mmarek@suse.cz>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
Arnaud Lacombe <lacombar@gmail.com>,
Srinivas Kandagatla <srinivas.kandagatla@st.com>
Subject: [PATCH 2/2] kconfig: factor code in menu_get_ext_help()
Date: Wed, 3 Aug 2011 21:52:07 -0400 [thread overview]
Message-ID: <1312422727-9740-2-git-send-email-lacombar@gmail.com> (raw)
In-Reply-To: <1312422727-9740-1-git-send-email-lacombar@gmail.com>
Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
---
| 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
--git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index beeb92e..8c2a97e 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -10,8 +10,7 @@
#include "lkc.h"
-static const char nohelp_text[] = N_(
- "There is no help available for this option.\n");
+static const char nohelp_text[] = "There is no help available for this option.";
struct menu rootmenu;
static struct menu **last_entry_ptr;
@@ -595,15 +594,14 @@ struct gstr get_relations_str(struct symbol **sym_arr)
void menu_get_ext_help(struct menu *menu, struct gstr *help)
{
struct symbol *sym = menu->sym;
+ const char *help_text = nohelp_text;
if (menu_has_help(menu)) {
if (sym->name)
str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
- str_append(help, _(menu_get_help(menu)));
- str_append(help, "\n");
- } else {
- str_append(help, nohelp_text);
+ help_text = menu_get_help(menu);
}
+ str_printf(help, "%s\n", _(help_text));
if (sym)
get_symbol_str(help, sym);
}
--
1.7.6.153.g78432
next prev parent reply other threads:[~2011-08-04 1:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-04 1:52 [PATCH 1/2] kconfig/nconf: nuke unreferenced `nohelp_text' Arnaud Lacombe
2011-08-04 1:52 ` Arnaud Lacombe [this message]
2011-08-08 14:03 ` [PATCH 2/2] kconfig: factor code in menu_get_ext_help() Michal Marek
2011-08-04 1:53 ` [PATCH 1/2] kconfig/nconf: nuke unreferenced `nohelp_text' Arnaud Lacombe
2011-08-08 14:02 ` Michal Marek
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=1312422727-9740-2-git-send-email-lacombar@gmail.com \
--to=lacombar@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmarek@suse.cz \
--cc=srinivas.kandagatla@st.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 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.