From patchwork Mon Feb 23 15:10:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng Renquan X-Patchwork-Id: 8414 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 n1NFAKpX011202 for ; Mon, 23 Feb 2009 15:10:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755649AbZBWPKa (ORCPT ); Mon, 23 Feb 2009 10:10:30 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755625AbZBWPKa (ORCPT ); Mon, 23 Feb 2009 10:10:30 -0500 Received: from ti-out-0910.google.com ([209.85.142.184]:26146 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755503AbZBWPK3 (ORCPT ); Mon, 23 Feb 2009 10:10:29 -0500 Received: by ti-out-0910.google.com with SMTP id d10so1553408tib.23 for ; Mon, 23 Feb 2009 07:10:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=k3SugYLwYUCfkor0wk5kPzavbY6+ZSQjOF3Y8WYPsQo=; b=PF/Ky4dOAAGt+mkywjV9lVmjyM0LJ9dRiACcHXKAhBMFX7RzZ0nUMwoTbtmFYU70bb TSG9OmWCeoM7XABIzEn8L+f3DkXXKSL8QiSC1oxfDyZQ/g7//UN/u374v14CSujRl+iD bnWnC7FofeVTC6Q1rVxVR2hl8KuPChxi7gqSI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=GH6vUUz30mDv57cOjf9d0tYW/V/QWq+rGFym1+dYO0dX+oaOrD3iP3umDFxtGavaBq 4EWwgy0UUGyO0W1KH8ZwwvTWOH5H9KShU4boueT02GsqN8GbhyU917pQd8KjAqAXv1hB XaQuFNyFN61xxdNiHG2mDPoePTfAFNFckrSYQ= Received: by 10.110.43.16 with SMTP id q16mr5955954tiq.7.1235401828159; Mon, 23 Feb 2009 07:10:28 -0800 (PST) Received: from localhost.localdomain ([59.40.122.219]) by mx.google.com with ESMTPS id j5sm715564tid.21.2009.02.23.07.10.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 23 Feb 2009 07:10:27 -0800 (PST) From: Cheng Renquan To: Randy Dunlap , Sam Ravnborg , Roman Zippel Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, cr_quan@163.com Subject: [PATCH 5/6] [KBUILD] make use of menu_get_ext_help in qconfig Date: Mon, 23 Feb 2009 23:10:03 +0800 Message-Id: <1235401804-8136-6-git-send-email-crquan@gmail.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1235401804-8136-5-git-send-email-crquan@gmail.com> References: <1235401804-8136-1-git-send-email-crquan@gmail.com> <1235401804-8136-2-git-send-email-crquan@gmail.com> <1235401804-8136-3-git-send-email-crquan@gmail.com> <1235401804-8136-4-git-send-email-crquan@gmail.com> <1235401804-8136-5-git-send-email-crquan@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Signed-off-by: Cheng Renquan --- scripts/kconfig/qconf.cc | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 5d0fd38..9e03592 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1041,12 +1041,10 @@ void ConfigInfoView::menuInfo(void) if (showDebug()) debug = debug_info(sym); - help = menu_get_help(menu); - /* Gettextize if the help text not empty */ - if (help.isEmpty()) - help = print_filter(menu_get_help(menu)); - else - help = print_filter(_(menu_get_help(menu))); + struct gstr help_gstr = str_new(); + menu_get_ext_help(menu, &help_gstr); + help = print_filter(str_get(&help_gstr)); + str_free(&help_gstr); } else if (menu->prompt) { head += ""; head += print_filter(_(menu->prompt->text));