From: Randy Dunlap <rdunlap@xenotime.net>
To: Li Zefan <lizf@cn.fujitsu.com>
Cc: Michal Marek <mmarek@suse.cz>,
Randy Dunlap <randy.dunlap@oracle.com>,
Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-kbuild@vger.kernel.org
Subject: Re: [PATCH 4/6] gconfig: fix null pointer warning
Date: Tue, 27 Apr 2010 13:36:58 -0700 [thread overview]
Message-ID: <20100427133658.64e25ab5.rdunlap@xenotime.net> (raw)
In-Reply-To: <4BD696EC.1090100@cn.fujitsu.com>
On Tue, 27 Apr 2010 15:49:00 +0800 Li Zefan wrote:
> In gconfig if you enable "Show all options", you'll see some "(null)"
> config options, and clicking those options triggers a warning:
>
> (gconf:9368): Gtk-CRITICAL **: gtk_text_buffer_insert_with_tags: assertion `text != NULL' failed
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> scripts/kconfig/gconf.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
> index 1b18329..d669882 100644
> --- a/scripts/kconfig/gconf.c
> +++ b/scripts/kconfig/gconf.c
> @@ -1343,7 +1343,8 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
> #endif
>
> if ((opt_mode == OPT_NORMAL && !menu_is_visible(child1)) ||
> - (opt_mode == OPT_PROMPT && !menu_has_prompt(child1))) {
> + (opt_mode == OPT_PROMPT && !menu_has_prompt(child1)) ||
> + (opt_mode == OPT_ALL && !menu_get_prompt(child1))) {
>
> /* remove node */
> if (gtktree_iter_find_node(dst, menu1) != NULL) {
> @@ -1425,7 +1426,7 @@ static void display_tree(struct menu *menu)
>
> if ((opt_mode == OPT_NORMAL && menu_is_visible(child)) ||
> (opt_mode == OPT_PROMPT && menu_has_prompt(child)) ||
> - (opt_mode == OPT_ALL))
> + (opt_mode == OPT_ALL && menu_get_prompt(child)))
> place_node(child, fill_row(child));
> #ifdef DEBUG
> printf("%*c%s: ", indent, ' ', menu_get_prompt(child));
> --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
next prev parent reply other threads:[~2010-04-27 20:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 7:48 [PATCH 1/6] kconfig: print symbol type in help text Li Zefan
2010-04-27 7:48 ` Li Zefan
2010-04-27 20:36 ` Randy Dunlap
2010-04-27 7:48 ` [PATCH 3/6] gconfig: fix to tag NEW symbols correctly Li Zefan
2010-04-27 7:49 ` [PATCH 4/6] gconfig: fix null pointer warning Li Zefan
2010-04-27 20:36 ` Randy Dunlap [this message]
2010-04-27 7:49 ` [PATCH 5/6] xconfig: remove unused function Li Zefan
2010-04-27 7:49 ` [PATCH 6/6] xconfig: Add support to show hidden options which have prompts Li Zefan
2010-04-27 20:42 ` Randy Dunlap
[not found] ` <4BD91FEC.6070903@cn.fujitsu.com>
2010-04-29 14:40 ` Randy Dunlap
[not found] ` <4BDA35AD.6000407@cn.fujitsu.com>
2010-05-03 18:01 ` Randy Dunlap
2010-04-27 20:36 ` [PATCH 1/6] kconfig: print symbol type in help text 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=20100427133658.64e25ab5.rdunlap@xenotime.net \
--to=rdunlap@xenotime.net \
--cc=akpm@linux-foundation.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mmarek@suse.cz \
--cc=randy.dunlap@oracle.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).