Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751377AbaKTFv1 (ORCPT ); Thu, 20 Nov 2014 00:51:27 -0500 Received: from gproxy9-pub.mail.unifiedlayer.com ([69.89.20.122]:59503 "HELO gproxy9-pub.mail.unifiedlayer.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750792AbaKTFvZ (ORCPT ); Thu, 20 Nov 2014 00:51:25 -0500 X-Authority-Analysis: v=2.1 cv=Hd2HEE08 c=1 sm=1 tr=0 a=PkLafpyMt2xwRD+PMJrZ3Q==:117 a=PkLafpyMt2xwRD+PMJrZ3Q==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=J0QyKEt1u0cA:10 a=IkcTkHD0fZMA:10 a=ptNznvi-AAAA:8 a=fztpppUj2ZoA:10 a=Xwexni91U_8A:10 a=5y4faFyK3SkA:10 a=ccRtT4pHRuiIfriKJfMA:9 a=QEXdDO2ut3YA:10 Date: Wed, 19 Nov 2014 22:44:37 -0700 From: Eddie Kovsky To: "Yann E. MORIN" , linux-kbuild@vger.kernel.org Cc: trivial@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] kconfig: Fix compiler warning Message-ID: <20141120054437.GA30162@athena> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.23 (2014-03-12) X-Identified-User: {1650:box492.bluehost.com:edkovsky:edkovsky.org} {sentby:smtp auth 65.102.196.57 authed with ewk+edkovsky.org} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixes gcc warning when building linux-next: 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); ^ scripts/kconfig/menu.c:551:19: note: ‘jump’ was declared here struct jump_key *jump; ^ HOSTLD scripts/kconfig/conf Moved the initialization of struct jump_key *jump outside the first 'if' branch so it can be available throughout the function. Also uses the preferred pointer syntax for passing the size of a struct. Tested on next-20141119. Signed-off-by: Eddie Kovsky --- scripts/kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index a26cc5d2a9b0..a728d23949e7 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -559,8 +559,8 @@ static void get_prompt_str(struct gstr *r, struct property *prop, if (location == NULL && accessible) location = menu; } + jump = xmalloc(sizeof(*jump)); if (head && location) { - jump = xmalloc(sizeof(struct jump_key)); if (menu_is_visible(prop->menu)) { /* -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/