Commit f2b1b663 authored by Peter Kümmel's avatar Peter Kümmel Committed by Greg Kroah-Hartman

kconfig: Fix warning "‘jump’ may be used uninitialized"

commit 2d560306 upstream.

Warning:
In file included from scripts/kconfig/zconf.tab.c:2537:0:
scripts/kconfig/menu.c: In function ‘get_symbol_str’:
scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized]
     jump->offset = strlen(r->s);

Simplifies the test logic because (head && local) means (jump != 0)
and makes GCC happy when checking if the jump pointer was initialized.
Signed-off-by: default avatarPeter Kümmel <syntheticpp@gmx.net>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
[ dileks: v2: Backported to fit v3.10 ]
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3478a33e
...@@ -525,7 +525,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, ...@@ -525,7 +525,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
{ {
int i, j; int i, j;
struct menu *submenu[8], *menu, *location = NULL; struct menu *submenu[8], *menu, *location = NULL;
struct jump_key *jump; struct jump_key *jump = NULL;
str_printf(r, _("Prompt: %s\n"), _(prop->text)); str_printf(r, _("Prompt: %s\n"), _(prop->text));
menu = prop->menu->parent; menu = prop->menu->parent;
...@@ -563,7 +563,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, ...@@ -563,7 +563,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
str_printf(r, _(" Location:\n")); str_printf(r, _(" Location:\n"));
for (j = 4; --i >= 0; j += 2) { for (j = 4; --i >= 0; j += 2) {
menu = submenu[i]; menu = submenu[i];
if (head && location && menu == location) if (jump && menu == location)
jump->offset = r->len - 1; jump->offset = r->len - 1;
str_printf(r, "%*c-> %s", j, ' ', str_printf(r, "%*c-> %s", j, ' ',
_(menu_get_prompt(menu))); _(menu_get_prompt(menu)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment