summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2014-11-29 17:26:04 +0900
committerTom Rini <trini@ti.com>2014-12-08 09:35:48 -0500
commit60cd06e13c32c569a03bb7b4a872b770c2b7813a (patch)
treef874a6392c40ef19325e1b8166680378199b64dc /scripts
parent61eb5d72abd3d156baf9de2133226dc5d8da3150 (diff)
downloadu-boot-imx-60cd06e13c32c569a03bb7b4a872b770c2b7813a.zip
u-boot-imx-60cd06e13c32c569a03bb7b4a872b770c2b7813a.tar.gz
u-boot-imx-60cd06e13c32c569a03bb7b4a872b770c2b7813a.tar.bz2
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> [ imported from Linux Kernel, commit 2d5603060967 ] Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/menu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index a26cc5d..72c9dba 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,
{
int i, j;
struct menu *submenu[8], *menu, *location = NULL;
- struct jump_key *jump;
+ struct jump_key *jump = NULL;
str_printf(r, _("Prompt: %s\n"), _(prop->text));
menu = prop->menu->parent;
@@ -586,7 +586,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
str_printf(r, _(" Location:\n"));
for (j = 4; --i >= 0; j += 2) {
menu = submenu[i];
- if (head && location && menu == location)
+ if (jump && menu == location)
jump->offset = strlen(r->s);
str_printf(r, "%*c-> %s", j, ' ',
_(menu_get_prompt(menu)));