diff options
author | Peter Kümmel <syntheticpp@gmx.net> | 2014-11-04 06:01:59 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2014-11-28 08:39:13 -0500 |
commit | 2d560306096739e2251329ab5c16059311a151b0 (patch) | |
tree | 9e01f1065210a9827f707c824cb3c12823117761 | |
parent | a1e7b7bb1ab5bf3498eacc2d22beb56dac1d4e08 (diff) |
kconfig: Fix warning "‘jump’ may be used uninitialized"
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: Peter Kümmel <syntheticpp@gmx.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r-- | scripts/kconfig/menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index a26cc5d2a9b0..72c9dba84c5d 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c | |||
@@ -548,7 +548,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, | |||
548 | { | 548 | { |
549 | int i, j; | 549 | int i, j; |
550 | struct menu *submenu[8], *menu, *location = NULL; | 550 | struct menu *submenu[8], *menu, *location = NULL; |
551 | struct jump_key *jump; | 551 | struct jump_key *jump = NULL; |
552 | 552 | ||
553 | str_printf(r, _("Prompt: %s\n"), _(prop->text)); | 553 | str_printf(r, _("Prompt: %s\n"), _(prop->text)); |
554 | menu = prop->menu->parent; | 554 | menu = prop->menu->parent; |
@@ -586,7 +586,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop, | |||
586 | str_printf(r, _(" Location:\n")); | 586 | str_printf(r, _(" Location:\n")); |
587 | for (j = 4; --i >= 0; j += 2) { | 587 | for (j = 4; --i >= 0; j += 2) { |
588 | menu = submenu[i]; | 588 | menu = submenu[i]; |
589 | if (head && location && menu == location) | 589 | if (jump && menu == location) |
590 | jump->offset = strlen(r->s); | 590 | jump->offset = strlen(r->s); |
591 | str_printf(r, "%*c-> %s", j, ' ', | 591 | str_printf(r, "%*c-> %s", j, ' ', |
592 | _(menu_get_prompt(menu))); | 592 | _(menu_get_prompt(menu))); |