From patchwork Fri Dec 21 08:33:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154380 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp646803ljp; Fri, 21 Dec 2018 00:33:41 -0800 (PST) X-Google-Smtp-Source: ALg8bN6nj/9w9Nju3/PTyc7/DZcIi4SL+R9yCwgEwCEsb/g+mPpALoMHyTshwtFPQ6HKG6OdDydS X-Received: by 2002:a17:902:a9c4:: with SMTP id b4mr1602326plr.298.1545381221608; Fri, 21 Dec 2018 00:33:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545381221; cv=none; d=google.com; s=arc-20160816; b=AI+yWu43hs/1n4AiVa5RhtTYOQqIqPCMd/PsDmqm0xAG2RzybTqAZJxei4IVlINphQ kgBHnqnB3xLPO14lBXSpsV2sOu6ZozIP3sM9J19txm3Z5wfj7XU6hhRzktuScbsBlTb7 Erz0mVHY2T3PXoF9eZJUHDd6LBL2y5ur4FWBzHhw/qdW0ZHe5d1NBRtMQ1xw4Hi49Z3g x/HkBMwgoyUlGHLoy2KQedUqi+Jop0mZD1b8YvKqobr/sR5ZM449GjjAl+2/kOpkS8f8 50dmLshWsw8G1zF2bUL6oSF5sTMFaSRxpItdK5wgE9IUNznGewuigGASDow3WZY20hS2 EdKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=FWpKupWsXaMmpNholmQkdc+vAkpvhP5jjygfkS3neP4=; b=zleNOvKJpP3t/UIkkY0GOGxSBtGLcfTjqO8s6qtZApUeDbm15Xtx1QSH15wiis9K8+ hkyUvOTX2QuJRzHgoQ9NUtoSQkZi75Rr1jExKlNGWYa4XzDYNQFS6U+GAsiWaaKjf9Gn +8P+sVm7vbIo1qtej1K2VMM7qLrPpIAHMquOL/H2a9WImXr/Ymx6UHz2mf4OoqpXU+Sj 9N5lNboylFcMZ7SwMrP84mayIAjH5Ll4dKCrvUIiBjn0fNweoNvjiwdvCI7Z74Q8yYy3 uDEzzYtkDUBu+4c0ejyjvxuN82xfkeLth8782RBeK6UzU3BQ5IU+S6vVAnfM8r2yul9X syBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=qMiB9sPd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s71si21603650pfk.105.2018.12.21.00.33.41; Fri, 21 Dec 2018 00:33:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=qMiB9sPd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387973AbeLUIdj (ORCPT + 31 others); Fri, 21 Dec 2018 03:33:39 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:38272 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387570AbeLUId3 (ORCPT ); Fri, 21 Dec 2018 03:33:29 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id wBL8XAI7008714; Fri, 21 Dec 2018 17:33:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com wBL8XAI7008714 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545381191; bh=FWpKupWsXaMmpNholmQkdc+vAkpvhP5jjygfkS3neP4=; h=From:To:Cc:Subject:Date:From; b=qMiB9sPdoS8B/VlXQDDpqLN2oZqjHpkE8vKcu6YeJYKDFR2zR/A4gmi45Adw1Sp+i 7rTqXQFuqGNUG19li7jrlDZImqmv8TYdbZWq16mhfs5m+xPtahrqWY7/UVIBqncbU1 VoBn5p7vwArCeKLfv/e8nv1cTpV1ZFTt23lvGka4oAzJVqdygdZs7T878WMvJ4Cfyg Gg4b/l5loCH59wDioPDzrChGU5C7c8Rp1uokhIfL0FHZIDsE3dBy7Razaqx4jnGXLK J6ZyVAY9FdL6TtJOMiPefRZI7QPuLkBTgCQX0DWoMI1vNj26tdAbG3INDDJrmaPwoq oiUxCWAimbiTg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/5] kconfig: split some C files out of zconf.y Date: Fri, 21 Dec 2018 17:33:04 +0900 Message-Id: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I want to compile each C file independently instead of including all of them from zconf.y. These 4 files are low hanging fruits. Signed-off-by: Masahiro Yamada --- scripts/kconfig/Makefile | 19 +++++++++---------- scripts/kconfig/confdata.c | 1 + scripts/kconfig/expr.c | 2 ++ scripts/kconfig/lkc.h | 1 + scripts/kconfig/preprocess.c | 2 ++ scripts/kconfig/symbol.c | 2 +- scripts/kconfig/zconf.y | 4 ---- 7 files changed, 16 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 63b6092..d3bd687 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -142,13 +142,8 @@ help: @echo ' testconfig - Run Kconfig unit tests (requires python3 and pytest)' # =========================================================================== -# Shared Makefile for the various kconfig executables: -# conf: Used for defconfig, oldconfig and related targets # object files used by all kconfig flavours - -conf-objs := conf.o zconf.tab.o - -hostprogs-y := conf +common-objs := confdata.o expr.o symbol.o preprocess.o zconf.tab.o targets += zconf.lex.c @@ -156,9 +151,13 @@ targets += zconf.lex.c HOSTCFLAGS_zconf.lex.o := -I$(src) HOSTCFLAGS_zconf.tab.o := -I$(src) +# conf: Used for defconfig, oldconfig and related targets +hostprogs-y += conf +conf-objs := conf.o $(common-objs) + # nconf: Used for the nconfig target based on ncurses hostprogs-y += nconf -nconf-objs := nconf.o zconf.tab.o nconf.gui.o +nconf-objs := nconf.o nconf.gui.o $(common-objs) HOSTLDLIBS_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs) HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags) @@ -169,7 +168,7 @@ $(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg # mconf: Used for the menuconfig target based on lxdialog hostprogs-y += mconf lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o -mconf-objs := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog)) +mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs) HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs) $(foreach f, mconf.o $(lxdialog), \ @@ -181,7 +180,7 @@ $(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg # qconf: Used for the xconfig target based on Qt hostprogs-y += qconf qconf-cxxobjs := qconf.o -qconf-objs := zconf.tab.o +qconf-objs := $(common-objs) HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs) HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags) @@ -196,7 +195,7 @@ $(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg # gconf: Used for the gconfig target based on GTK+ hostprogs-y += gconf -gconf-objs := gconf.o zconf.tab.o +gconf-objs := gconf.o $(common-objs) HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs) HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index e32ada9..ea88355 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index ddb9c86..265f2af 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -3,6 +3,8 @@ * Copyright (C) 2002 Roman Zippel */ +#include +#include #include #include #include diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 4ff33cd..160a931 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -108,6 +108,7 @@ const char *str_get(struct gstr *gs); /* symbol.c */ void sym_clear_all_valid(void); struct symbol *sym_choice_default(struct symbol *sym); +struct property *sym_get_range_prop(struct symbol *sym); const char *sym_get_string_default(struct symbol *sym); struct symbol *sym_check_deps(struct symbol *sym); struct property *prop_alloc(enum prop_type type, struct symbol *sym); diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c index b028a48..592dfbfa 100644 --- a/scripts/kconfig/preprocess.c +++ b/scripts/kconfig/preprocess.c @@ -2,6 +2,7 @@ // // Copyright (C) 2018 Masahiro Yamada +#include #include #include #include @@ -9,6 +10,7 @@ #include #include "list.h" +#include "lkc.h" #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 364afa1..860414d 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -88,7 +88,7 @@ static struct property *sym_get_default_prop(struct symbol *sym) return NULL; } -static struct property *sym_get_range_prop(struct symbol *sym) +struct property *sym_get_range_prop(struct symbol *sym) { struct property *prop; diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 60ee8e7..32be913 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -730,8 +730,4 @@ void zconfdump(FILE *out) #include "zconf.lex.c" #include "util.c" -#include "confdata.c" -#include "expr.c" -#include "symbol.c" #include "menu.c" -#include "preprocess.c" From patchwork Fri Dec 21 08:33:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154382 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp646958ljp; Fri, 21 Dec 2018 00:33:51 -0800 (PST) X-Google-Smtp-Source: AFSGD/VK7Yu9pUuyCUxGN7Fw106/ylmsAsPs+X23CNCFFm1x2sxRKMJaBO8cz/Ol1mJBK9WHT53z X-Received: by 2002:a62:3c1:: with SMTP id 184mr1621661pfd.56.1545381231343; Fri, 21 Dec 2018 00:33:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545381231; cv=none; d=google.com; s=arc-20160816; b=uEuRr5TR5um2wd/CzWXeFyJWX+3sPyl0xO9Da+fLjizsgGHwC5BUjcVVqc2fvvt3cI svwe+aBurigH9wpnBaFijqHLlLRKUoQ680L3GUpDQu+SFtwgwBD9pKp2087+LZ/aFZ5w 5BrPDdL2Q0YFrc1/ciWhuON+Sl8XLEe4UeqhSUONfa6TlzJr0aUZ7pZ9am7aO6Xn9GRk gAIdbg/k4QurRQkpqafErmoGt1GOnNGsd6UKtJkYqcae+u8HEAEvriu3fYaD9uB34HAU +hcKBtjf8PbSLAIm9Rs6scFafVggShksgcd3BCFjVHVZRoLvspVveWy0Hp5HLqF3yxrA idEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=lekCqo0HXI1jLj/fEfh+Y+Q2bxBEx7hLHGkCSGgoLrw=; b=HxKyDP/yF359FNpGwZRriN3sHEF868TCIR6bB1XiIQfkecPDVsDAvkMAj9UYckAp75 nWeX5nzUzKFPoIveV9gIQCqFGuG+roo+FuXxPPbLHCZ8YMzq7Stn9K73FFFtWDPvzTLn eAiEoT6XR+6s3q0w8tMFViH4UrrXU/DnHXNn8GGylfOLKEWgva6p8YOi11ZyFHt2aJ7n AmPTBklHSIw8lMiVPQvGLAOr6buyWQE/eBHzlZmqlOVe9dsJBdjvqL95jrEU6tA7td7f YK8BcBXDoVDkrO9Nm/KgREGJueeGu0yYle5l+8dAsxmLStli0GDJypekXIvoXsVj4bCw HLAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=sSMDKsgc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v9si20815578pgo.23.2018.12.21.00.33.51; Fri, 21 Dec 2018 00:33:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=sSMDKsgc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388019AbeLUIdt (ORCPT + 31 others); Fri, 21 Dec 2018 03:33:49 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:38271 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387770AbeLUId3 (ORCPT ); Fri, 21 Dec 2018 03:33:29 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id wBL8XAI8008714; Fri, 21 Dec 2018 17:33:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com wBL8XAI8008714 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545381191; bh=lekCqo0HXI1jLj/fEfh+Y+Q2bxBEx7hLHGkCSGgoLrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sSMDKsgcLuGvMYguDAHaRMlAcNUntkgB6ID6hZE5Ek5B7X+vzCSsYRAvtu/Msm+Fm T70qENoPl0+JuS7CAfTy3ANEut/sdapV+e1AxHWsHnJnICe4Ty85BXy16rIxUYnnWI pXvCY+R9IRCxrAKr3T84W4hR6AQPB1kyKCGBv/ms/Y96Mw3QA3sjkAQQ0gOumzU3aM 1ZX9A7QAWYmpbPi5tuV7wKojMr3tR9iXLmeCogUunqvaZMlM1RJ8ePQv8OuVqvHxf8 b07bOp6NSWb+Tu5tDtUagBEe0ZxVnxJ2xFBgvNm8mOhDh7JGfutPenLoSFgCmu04st 6OoHW/q9GfULw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/5] kconfig: split the lexer out of zconf.y Date: Fri, 21 Dec 2018 17:33:05 +0900 Message-Id: <1545381188-514-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> References: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Compile zconf.lex.c independently of the other files. Signed-off-by: Masahiro Yamada --- scripts/kconfig/Makefile | 8 ++------ scripts/kconfig/lkc.h | 3 +++ scripts/kconfig/zconf.l | 1 + scripts/kconfig/zconf.y | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index d3bd687..65cdf8c 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -143,11 +143,9 @@ help: # =========================================================================== # object files used by all kconfig flavours -common-objs := confdata.o expr.o symbol.o preprocess.o zconf.tab.o +common-objs := confdata.o expr.o symbol.o preprocess.o zconf.lex.o zconf.tab.o -targets += zconf.lex.c - -# generated files seem to need this to find local include files +$(obj)/zconf.lex.o: $(obj)/zconf.tab.h HOSTCFLAGS_zconf.lex.o := -I$(src) HOSTCFLAGS_zconf.tab.o := -I$(src) @@ -202,8 +200,6 @@ HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags) $(obj)/gconf.o: $(obj)/.gconf-cfg -$(obj)/zconf.tab.o: $(obj)/zconf.lex.c - # check if necessary packages are available, and configure build flags define filechk_conf_cfg $(CONFIG_SHELL) $< diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 160a931..531ff7c 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -90,6 +90,9 @@ void *xrealloc(void *p, size_t size); char *xstrdup(const char *s); char *xstrndup(const char *s, size_t n); +/* zconf.l */ +int yylex(void); + struct gstr { size_t len; char *s; diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index 960e6c6..a9a83eb 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -15,6 +15,7 @@ #include #include "lkc.h" +#include "zconf.tab.h" #define YY_DECL static int yylex1(void) diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 32be913..07719a7 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -20,7 +20,6 @@ int cdebug = PRINTD; -int yylex(void); static void yyerror(const char *err); static void zconfprint(const char *err, ...); static void zconf_error(const char *err, ...); @@ -728,6 +727,5 @@ void zconfdump(FILE *out) } } -#include "zconf.lex.c" #include "util.c" #include "menu.c" From patchwork Fri Dec 21 08:33:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154378 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp646642ljp; Fri, 21 Dec 2018 00:33:32 -0800 (PST) X-Google-Smtp-Source: AFSGD/VwyNvaZV2GXTfOPopKARxw0Me/IhqI1rj5/g1ARjTdTQghueDBaFO5WP1IyxUCsGD6DdBK X-Received: by 2002:a62:4714:: with SMTP id u20mr1579308pfa.144.1545381212666; Fri, 21 Dec 2018 00:33:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545381212; cv=none; d=google.com; s=arc-20160816; b=IQPFfGQ5g/AcOi325FhUSxgc5qBfk7YCV2ZQdzFoJ19zX4SoBDDEE6uPa0Ne7i1I6F naAa/k7LHrFZujnIxeubSBXHIAtESayK5qupsgnym1vhpkWVDZeilKCgI0KAMxVU6ysE QZCsdybIEBz3YHsvT+Rd+hGRxhO3yvmTIWRaXCJ3quvTJ7D9aa4Byn88IbkkjaiFO0xj xEi/W3Oj+dVrg73tCOrCzVLnOj6YIMO6fF40iPWzE0jvlr8ee/s7V/xKjSi1uVCjI3/D HVMNP/MlIqO7eUkUqgA9QEQIlEWQH+uzy90RDsji1oPECD5NcJ30OWIrEut6xSKWWCz0 u6dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=6KtmSy+aamATmax2umX8Hgg8oZJ8Fh5fG9A7a5e+JtU=; b=eLgNoyI3JMl6w22zkk9TSHgoAlZfIiwwOryvsoG2xK0VqmaXw9OdNI3iE8q4jv+Gax ObV3j+VpuDR1sWcWvGXgV7EYRZXC3HBe0CdsE0cusprpL4jFKkfkwJyrtv2HzLkBZWzC csuR4zJphEN+pdBVg69XWtjBStFFRj3xN7lEX/28gBPHQr3RIUPQNruy8pq0xAVySqsN d3J6GhhiIm434kIZds/nI1wvuqdRgtbws/rafEk/5fC8W1a5tBCHAH1lTnFXnc/lhgPR GHAq253A0srssjrsLR9MBH7v9o24kglDy9eNl6ZZMYnieVOfVeR3SobkeWY4yhHcOwW8 PsRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=yuwRxhc4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 30si10924408pgv.191.2018.12.21.00.33.32; Fri, 21 Dec 2018 00:33:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=yuwRxhc4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387929AbeLUIda (ORCPT + 31 others); Fri, 21 Dec 2018 03:33:30 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:38269 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725799AbeLUId3 (ORCPT ); Fri, 21 Dec 2018 03:33:29 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id wBL8XAI9008714; Fri, 21 Dec 2018 17:33:11 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com wBL8XAI9008714 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545381192; bh=6KtmSy+aamATmax2umX8Hgg8oZJ8Fh5fG9A7a5e+JtU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yuwRxhc4LBqKuRHpR1Pecua2/FjybeOzxhht4RhoDlh9vOoX4MOPFP7YXk2CNRUSK djt4g1USNUmG272pOmkw4ltvaYH2m/NiKzcEzhuu2S/g4KGg6MSH8k+hc0/GoAGgvr BnfYnTnZHH83plZbnBWYuMlNGEA81WT7P6/ZGDqDy2OuFJaqo27GRzBwKWeMSGzhN0 nZvRGdAD3ueQOJ8ITOVwDgPqTSXngDZyvRbOo10awjJrFN6DG/RN18Num9iz1Mv+8p hebJy6ohokjiD2jtd1O7deTu0vDtSusTx+vpC7/UxsVh9EAqDFfmwZ43HkVTqLg3mx KKPiBD7M2+VVg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/5] kconfig: add static qualifiers to fix gconf warnings Date: Fri, 21 Dec 2018 17:33:06 +0900 Message-Id: <1545381188-514-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> References: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add "static" to functions that are locally used in gconf.c This fixes some "no previous prototype for ..." warnings. Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 14fc0fa..2d4e5a1 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -76,7 +76,7 @@ static void conf_changed(void); /* Helping/Debugging Functions */ -const char *dbg_sym_flags(int val) +static const char *dbg_sym_flags(int val) { static char buf[256]; @@ -106,8 +106,8 @@ const char *dbg_sym_flags(int val) return buf; } -void replace_button_icon(GladeXML * xml, GdkDrawable * window, - GtkStyle * style, gchar * btn_name, gchar ** xpm) +static void replace_button_icon(GladeXML *xml, GdkDrawable *window, + GtkStyle *style, gchar *btn_name, gchar **xpm) { GdkPixmap *pixmap; GdkBitmap *mask; @@ -125,7 +125,7 @@ void replace_button_icon(GladeXML * xml, GdkDrawable * window, } /* Main Window Initialization */ -void init_main_window(const gchar * glade_file) +static void init_main_window(const gchar *glade_file) { GladeXML *xml; GtkWidget *widget; @@ -187,7 +187,7 @@ void init_main_window(const gchar * glade_file) gtk_widget_show(main_wnd); } -void init_tree_model(void) +static void init_tree_model(void) { gint i; @@ -217,7 +217,7 @@ void init_tree_model(void) model1 = GTK_TREE_MODEL(tree1); } -void init_left_tree(void) +static void init_left_tree(void) { GtkTreeView *view = GTK_TREE_VIEW(tree1_w); GtkCellRenderer *renderer; @@ -259,7 +259,7 @@ static void renderer_edited(GtkCellRendererText * cell, const gchar * path_string, const gchar * new_text, gpointer user_data); -void init_right_tree(void) +static void init_right_tree(void) { GtkTreeView *view = GTK_TREE_VIEW(tree2_w); GtkCellRenderer *renderer; @@ -1209,8 +1209,8 @@ static GtkTreeIter found; /* * Find a menu in the GtkTree starting at parent. */ -GtkTreeIter *gtktree_iter_find_node(GtkTreeIter * parent, - struct menu *tofind) +static GtkTreeIter *gtktree_iter_find_node(GtkTreeIter *parent, + struct menu *tofind) { GtkTreeIter iter; GtkTreeIter *child = &iter; @@ -1421,7 +1421,7 @@ static void display_list(void) tree = tree2; } -void fixup_rootmenu(struct menu *menu) +static void fixup_rootmenu(struct menu *menu) { struct menu *child; static int menu_cnt = 0; From patchwork Fri Dec 21 08:33:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154379 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp646702ljp; Fri, 21 Dec 2018 00:33:35 -0800 (PST) X-Google-Smtp-Source: ALg8bN5zlEFp8G5y38gUzmJA/jbI8BPcbuZlAOSujJfPTjUNaheqswTRU7fgGG7C47cajE/B5THM X-Received: by 2002:a17:902:7e44:: with SMTP id a4mr1597144pln.338.1545381215749; Fri, 21 Dec 2018 00:33:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545381215; cv=none; d=google.com; s=arc-20160816; b=OfX4KbgheG8nY0yRPW6zTxalFQkVocCNF/UJ+Over0alizHorp6VT9PfVO6ezSbjT1 tSBS+GTbmIUgdnibwVgmxwCiI01BgUGjIF+E6AdCdtdY7XmUlRyJ7O4BtDSXXURYGYox UME7jWJXRZm1QhMUm98ddY7Wg4dNllhpH/O7D5VwgSXBDxbSRJQFz3flFE5UUS9ozdK8 1iWFrL1Fm6Bh21HH+iWaBnMmirVrh7+u3FlIDnUB1koEzUiu/oYiXv92dOSEHdAoz5SZ E5XpTD5Oe/KT5dXvLdeZUtbr7JzQbEqkOyO7MSN8wX/8wHj8FxC0hN5jlOT6KpVszXRg WWNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=tV9rNkRlb6CR7G/pajw0L0gaxKRUb6xWwUEsC0KmBrI=; b=Ju1ByuaK2a1kemPdQNNNxSyEheO96Ec7AzTsAEd7MNcJjYK/xzP+WLMPLySJCTEd38 BscEvSNkNpoUpFFKah7AmWmUojVCpju4ZIFc4VKEablb1LvN+7aelDtUG8CsueQDPQDO 7pgFjVDu0cgbEFjcn051kdvQJoQYRirCCB5Auzesfm498/jNVvBjmiXP9fWnffUSku1r 0fLif3t89/Kd0FKP5Si0gHTvND+PY7UUC3UgJVXz/Q3MvaPG1NkcP8g9dxR6y89skO4M CGA6JWWchpFjDd0T0CWK3l8aF7wx4XxGWMO1ZfygnU+d0o5jW2gebejfmRQhsoPK0mLl jFIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=3AQ6qMTC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 30si10924408pgv.191.2018.12.21.00.33.35; Fri, 21 Dec 2018 00:33:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=3AQ6qMTC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387851AbeLUIda (ORCPT + 31 others); Fri, 21 Dec 2018 03:33:30 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:38270 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387772AbeLUId2 (ORCPT ); Fri, 21 Dec 2018 03:33:28 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id wBL8XAIA008714; Fri, 21 Dec 2018 17:33:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com wBL8XAIA008714 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545381192; bh=tV9rNkRlb6CR7G/pajw0L0gaxKRUb6xWwUEsC0KmBrI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=3AQ6qMTCUuPacUR5/Xx8pCZ4/JkBrKnFERVZyJOjLpjrfFlxqBUv9HEl/41EIuHI7 49JMc9BHRmXBHO9xgz1EU6bqHtehNl5G4c2HzMAPI47QrxTdUAS+JPTbQODwP5JIBM gcLAwoz1MPPJX84Zy5Af4+IkbyHK2JuB932+oUvNu5Us61aNj2/t6ia+3SUvwUK68s eCqViKLJwyD7MwJQTibPtr16B/JTYL40tBKToIe3ukCFHioHSx3MRXXbG09GqkjFht 3ODyrccarHzDG+vDcLqw6QkF0Sxv38pHhC6smih6MMByqo1Vw7OC3s0UohmFJcxD+A JRv6a+msRDRgw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 4/5] kconfig: split images.c out of qconf.cc/gconf.c to fix gconf warnings Date: Fri, 21 Dec 2018 17:33:07 +0900 Message-Id: <1545381188-514-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> References: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, images.c is included by qconf.cc and gconf.c. qconf.cc uses all of xpm_* arrays, but gconf.c only some of them. Hence, lots of "... defined but not used" warnings are displayed when compiling gconf.c Splitting out images.c fixes the warnings. Signed-off-by: Masahiro Yamada --- scripts/kconfig/Makefile | 4 ++-- scripts/kconfig/gconf.c | 2 +- scripts/kconfig/images.c | 32 +++++++++++++++++--------------- scripts/kconfig/images.h | 33 +++++++++++++++++++++++++++++++++ scripts/kconfig/qconf.cc | 2 +- 5 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 scripts/kconfig/images.h -- 2.7.4 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 65cdf8c..ec204fa 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -178,7 +178,7 @@ $(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg # qconf: Used for the xconfig target based on Qt hostprogs-y += qconf qconf-cxxobjs := qconf.o -qconf-objs := $(common-objs) +qconf-objs := images.o $(common-objs) HOSTLDLIBS_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs) HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags) @@ -193,7 +193,7 @@ $(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg # gconf: Used for the gconfig target based on GTK+ hostprogs-y += gconf -gconf-objs := gconf.o $(common-objs) +gconf-objs := gconf.o images.o $(common-objs) HOSTLDLIBS_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs) HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags) diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index 2d4e5a1..b3d438c 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -9,7 +9,7 @@ #include #include "lkc.h" -#include "images.c" +#include "images.h" #include #include diff --git a/scripts/kconfig/images.c b/scripts/kconfig/images.c index ef43b81..b4fa0e4 100644 --- a/scripts/kconfig/images.c +++ b/scripts/kconfig/images.c @@ -3,7 +3,9 @@ * Copyright (C) 2002 Roman Zippel */ -static const char *xpm_load[] = { +#include "images.h" + +const char *xpm_load[] = { "22 22 5 1", ". c None", "# c #000000", @@ -33,7 +35,7 @@ static const char *xpm_load[] = { "###############.......", "......................"}; -static const char *xpm_save[] = { +const char *xpm_save[] = { "22 22 5 1", ". c None", "# c #000000", @@ -63,7 +65,7 @@ static const char *xpm_save[] = { "..##################..", "......................"}; -static const char *xpm_back[] = { +const char *xpm_back[] = { "22 22 3 1", ". c None", "# c #000083", @@ -91,7 +93,7 @@ static const char *xpm_back[] = { "......................", "......................"}; -static const char *xpm_tree_view[] = { +const char *xpm_tree_view[] = { "22 22 2 1", ". c None", "# c #000000", @@ -118,7 +120,7 @@ static const char *xpm_tree_view[] = { "......................", "......................"}; -static const char *xpm_single_view[] = { +const char *xpm_single_view[] = { "22 22 2 1", ". c None", "# c #000000", @@ -145,7 +147,7 @@ static const char *xpm_single_view[] = { "......................", "......................"}; -static const char *xpm_split_view[] = { +const char *xpm_split_view[] = { "22 22 2 1", ". c None", "# c #000000", @@ -172,7 +174,7 @@ static const char *xpm_split_view[] = { "......................", "......................"}; -static const char *xpm_symbol_no[] = { +const char *xpm_symbol_no[] = { "12 12 2 1", " c white", ". c black", @@ -189,7 +191,7 @@ static const char *xpm_symbol_no[] = { " .......... ", " "}; -static const char *xpm_symbol_mod[] = { +const char *xpm_symbol_mod[] = { "12 12 2 1", " c white", ". c black", @@ -206,7 +208,7 @@ static const char *xpm_symbol_mod[] = { " .......... ", " "}; -static const char *xpm_symbol_yes[] = { +const char *xpm_symbol_yes[] = { "12 12 2 1", " c white", ". c black", @@ -223,7 +225,7 @@ static const char *xpm_symbol_yes[] = { " .......... ", " "}; -static const char *xpm_choice_no[] = { +const char *xpm_choice_no[] = { "12 12 2 1", " c white", ". c black", @@ -240,7 +242,7 @@ static const char *xpm_choice_no[] = { " .... ", " "}; -static const char *xpm_choice_yes[] = { +const char *xpm_choice_yes[] = { "12 12 2 1", " c white", ". c black", @@ -257,7 +259,7 @@ static const char *xpm_choice_yes[] = { " .... ", " "}; -static const char *xpm_menu[] = { +const char *xpm_menu[] = { "12 12 2 1", " c white", ". c black", @@ -274,7 +276,7 @@ static const char *xpm_menu[] = { " .......... ", " "}; -static const char *xpm_menu_inv[] = { +const char *xpm_menu_inv[] = { "12 12 2 1", " c white", ". c black", @@ -291,7 +293,7 @@ static const char *xpm_menu_inv[] = { " .......... ", " "}; -static const char *xpm_menuback[] = { +const char *xpm_menuback[] = { "12 12 2 1", " c white", ". c black", @@ -308,7 +310,7 @@ static const char *xpm_menuback[] = { " .......... ", " "}; -static const char *xpm_void[] = { +const char *xpm_void[] = { "12 12 2 1", " c white", ". c black", diff --git a/scripts/kconfig/images.h b/scripts/kconfig/images.h new file mode 100644 index 0000000..d8ff614 --- /dev/null +++ b/scripts/kconfig/images.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2002 Roman Zippel + */ + +#ifndef IMAGES_H +#define IMAGES_H + +#ifdef __cplusplus +extern "C" { +#endif + +extern const char *xpm_load[]; +extern const char *xpm_save[]; +extern const char *xpm_back[]; +extern const char *xpm_tree_view[]; +extern const char *xpm_single_view[]; +extern const char *xpm_split_view[]; +extern const char *xpm_symbol_no[]; +extern const char *xpm_symbol_mod[]; +extern const char *xpm_symbol_yes[]; +extern const char *xpm_choice_no[]; +extern const char *xpm_choice_yes[]; +extern const char *xpm_menu[]; +extern const char *xpm_menu_inv[]; +extern const char *xpm_menuback[]; +extern const char *xpm_void[]; + +#ifdef __cplusplus +} +#endif + +#endif /* IMAGES_H */ diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index c897998..8be8a70 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -32,7 +32,7 @@ #include "qconf.h" #include "qconf.moc" -#include "images.c" +#include "images.h" static QApplication *configApp; From patchwork Fri Dec 21 08:33:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 154381 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp646887ljp; Fri, 21 Dec 2018 00:33:46 -0800 (PST) X-Google-Smtp-Source: ALg8bN5KxCTYZYussoYNRMCl/3gPSTpzzRn8p5C720GY6KkZJ5XB04wJ1sfKHnSA7FMw4/bQGduf X-Received: by 2002:a63:d904:: with SMTP id r4mr1500380pgg.207.1545381226730; Fri, 21 Dec 2018 00:33:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545381226; cv=none; d=google.com; s=arc-20160816; b=O4RUZojK6JtNgYXg3fkN87w1sKOSModBILqeUmrvRCC+7evWxeZNiUMsDPmoKtaO7L t657CnWlaeznO9k0tGrq0WCdaBk4ClaW+OP/WXkoBDeOVvFypsJByCriA6yzHp6ezTLn T3MFH4Oxm3Tk+z7PQEkTtqjI+kgHOO0z/wWYUiDUcWAO119mwyBTTTcn/vG3h3TvtIpi 6XsgBmJ3wgXRT1Nwlh4bER/nsDVZmt5/4/MxXED8wDoCVxPVODV9s27tLk+jakcNIOLo 7tr0iG0bcn+rBQPQEkKPe6qjQS75LrnUcSD1hwzXhP99nKnGxcEDHiosNB/5eZbTweQP 5hGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=g7sZEau6L6Ouy/B1r4t010I0LvMXXxn2pV3G1cEPXIg=; b=EQ6jNlJpug0MNsNtUP9agQ23CZq6iJdsNf6rFHeATeZXyanV+0D8kM3eKdrFIXF0TA h7Sg4wvW79appZjv8VYebRYdR1e5v5nDYLZDci+LgfQYh4cpcqasilfNGiripF/S5ear LsLRwIKfwprhu1hA8K4V+qV1aXHohXyk9alzQS90t1BIK/qvU38MN5mukKQBL/SbKt+j 7J5V+1eRuVibuRS9xW9BGQn5q0Wsg6L2l5anm8OpNnWNqAzd9KeD0z023elT8e8pBmrN AR3xqETsqm2v95iqfoPo7BNqrwFC/U16ORFn+eWaExrRPDHCPm6m76yDxwhAPOItMpz/ hiWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ecwg+YWN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g69si21241634pfg.225.2018.12.21.00.33.46; Fri, 21 Dec 2018 00:33:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ecwg+YWN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387818AbeLUId3 (ORCPT + 31 others); Fri, 21 Dec 2018 03:33:29 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:38268 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387773AbeLUId2 (ORCPT ); Fri, 21 Dec 2018 03:33:28 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id wBL8XAIB008714; Fri, 21 Dec 2018 17:33:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com wBL8XAIB008714 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1545381193; bh=g7sZEau6L6Ouy/B1r4t010I0LvMXXxn2pV3G1cEPXIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ecwg+YWNTBIREoqhB8KuLcsbcjMpTOnRu1uuZf/wBfHKU9BuCbOydjg0ccaC6PbjF 8lT31Wzyh9ZZRbLt6CTv4meoz3ccH6CgNBLBO0E1IHIRgtEAYjOg+nVMlND65SyAeD 3TTE6YwomrBrxPCJ23Q8WcIAOXzQpgKI+ODnnOxsPogJEUkcHH5Xoy1VhlJKkpR/nX WHIF6n9Kpbi0eFkyOxWgs94xJy6TZVHryMCBnA+0teYW/nN8xyt6EnDnvr2mxWGoV6 3LqDy1YIss2b8gNZUJsJlsO6oCvSdr2BnBX4igzlIWik6ZRcsqerFZQYWoJBjCe+Aw ltJr/5PsGtE4Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 5/5] kconfig: surround dbg_sym_flags with #ifdef DEBUG to fix gconf warning Date: Fri, 21 Dec 2018 17:33:08 +0900 Message-Id: <1545381188-514-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> References: <1545381188-514-1-git-send-email-yamada.masahiro@socionext.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the following warning: no previous prototype for ‘dbg_sym_flags’ [-Wmissing-prototypes] Signed-off-by: Masahiro Yamada --- scripts/kconfig/gconf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index b3d438c..5d4ecf3 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -75,7 +75,7 @@ static gchar **fill_row(struct menu *menu); static void conf_changed(void); /* Helping/Debugging Functions */ - +#ifdef DEBUG static const char *dbg_sym_flags(int val) { static char buf[256]; @@ -105,6 +105,7 @@ static const char *dbg_sym_flags(int val) return buf; } +#endif static void replace_button_icon(GladeXML *xml, GdkDrawable *window, GtkStyle *style, gchar *btn_name, gchar **xpm)