From patchwork Thu Jan 11 13:39:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124204 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp693672qgn; Thu, 11 Jan 2018 05:40:02 -0800 (PST) X-Google-Smtp-Source: ACJfBovIRCURGLvjH+u6+4Id0NxOu5pQYhQl32kXBDeJWybjcHqrU0BujpbjFr1WxjDQHlJTau0W X-Received: by 10.84.247.141 with SMTP id o13mr22253654pll.285.1515678002043; Thu, 11 Jan 2018 05:40:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515678002; cv=none; d=google.com; s=arc-20160816; b=LlfmQJwKKhmgBRzo+Cb2On/iPUbQ/4/H+i7B0ADyw6x9nDnW+gKbzjATgtNoZCQnJQ b1H8f+Ojxw3R79ky4VIcLU6Isl1QN0iAx5qve7Sy9hMq0z2+ceLZN5sFR8XPWHCOO0sH TNn/Q3Vdjl2SQ39ue5XxDWQaDlbCuSdyW7vJNg9HB/zAlr/5lxPiozDnIKApWKifBxQb A24pzm9FfqqBEwZ5Yf1FVjcgWUnOhhad2blY4rBmM2nYh5d8U6XIAlzhsD+p69ex98cr MLw+Ga9OmI2pJbQxsk9JVbhwTsk7RDD+efnk3K8j3gPhq9e+xyV5YLVFm6xTyl833dvH uQJw== 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:arc-authentication-results; bh=ipEnNr7Hvpv4uej4jxVX+KcKUHPVnwFlY2AhqCe2HyY=; b=Dgu2DmHbiQe5+msJ2VCd8/dSEFoQRs3YM1EiellTlZUZj08IfKiBpAtML22eumrUBZ AXU8gL2fWJvmjAg1XOXacuq90A5i7JreSOryBfkKxBdpijd2MhrPC9+9E08aEHo7EiKf 2rdDq9S1Svq09McSo4IAzB3fAK5sWQ+v3vOt0dQHKoWRuwzULybhmn+BOFasDU6LKwXs tf6rB0TQ10eDZfpprmRoQ/Pi3iU/pXTtQHT2ojlPP9mM3rw0kPpaMe1uPmishubL7S7k ZzayojuWbve7PhcrSwEvkK+lz+6USJOO3wyjdsNQUFuatnhPxQ4CZhou7eaoqiQjkH5T 3yfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=wXTyT5fy; 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 a33si13834895pla.546.2018.01.11.05.40.01; Thu, 11 Jan 2018 05:40:02 -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=wXTyT5fy; 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 S934276AbeAKNkA (ORCPT + 28 others); Thu, 11 Jan 2018 08:40:00 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:21221 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753045AbeAKNj4 (ORCPT ); Thu, 11 Jan 2018 08:39:56 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0BDdnaP002436; Thu, 11 Jan 2018 22:39:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0BDdnaP002436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515677990; bh=ipEnNr7Hvpv4uej4jxVX+KcKUHPVnwFlY2AhqCe2HyY=; h=From:To:Cc:Subject:Date:From; b=wXTyT5fyZdLHNj4+XosJsHydsqx583eRTefOuHNN38YQhVYYV06Tq95O2Xrz3EtJG KK/5i1uVcil6EWCS2gP8qWaivo6DHjEmWczm0N/LCuLCGlQ1sa/vr5gMbs2sh43Awm Ho7RTKePcBUa9IZ0dLpNKNp0AMl9RT8tuU9jz9dPR6tX3lIx55NMBD+0sKlw63muAb pwl7EO3xyQXOm5UHPjYOHkfIgjXnik3NQeVcPxfaCJBhoW3MEuFm4Ys76eHOVb6Ez6 P3Ads21uBt+uJqjk253t2yzUDeyQrpeM09jgJ5YzOVvSpvV/5w9hVWvtkDltU32edz S6eYnk+JQUCPQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] kconfig: make input_mode static Date: Thu, 11 Jan 2018 22:39:39 +0900 Message-Id: <1515677981-21952-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 Sparse reports: warning: symbol 'input_mode' was not declared. Should it be static? Signed-off-by: Masahiro Yamada --- scripts/kconfig/conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 8b9cdf4..31c09c6 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -35,7 +35,8 @@ enum input_mode { savedefconfig, listnewconfig, olddefconfig, -} input_mode = oldaskconfig; +}; +static enum input_mode input_mode = oldaskconfig; static int indent = 1; static int tty_stdio; From patchwork Thu Jan 11 13:39:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124206 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp694241qgn; Thu, 11 Jan 2018 05:40:31 -0800 (PST) X-Google-Smtp-Source: ACJfBosluCQSsCXMYY72FK6QkT+u6YYZY6RxDvqukMJ7sTycm3IcnjouyAtoPDv965oxJV7ngnxU X-Received: by 10.159.242.136 with SMTP id u8mr16580656plr.291.1515678031569; Thu, 11 Jan 2018 05:40:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515678031; cv=none; d=google.com; s=arc-20160816; b=GWjOfC0sq0LQALbruWVslVqPKHfu4pI5jwS3O6mmF2mhnlG9amAnv+diAgj+BlNR39 wjpRA7y5Mg3d3vQIS4J0+dl9GrdeH9hyyHkGbDTI60rvMi/qjrHTjeqqFGxvBvtbq/ln mFHMhoiQHVXU9wI01dNYJYZixiPLVDPF5/uFDLO4QjCwyhiwvUJnvYM6JOyanonj5CI/ QmdF4PXv22GmQx1eYGBB2nP2wvoveAu42msqpTLgKch+yJ+yII0wDtdeDE15AXbd582L FM5ftzYRbXenuCO98X99LDAz0iVPHtFnBACcZv1KpPS5tdfPE7onIc/N3kgzk/y7fdzz aEOQ== 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 :arc-authentication-results; bh=xmbxBYJ2/yjaGGGDXV7NvXHUmcEH04QM4bolXFZinFw=; b=LWtRP22dmmi2arqeksATTHH55QbZBjweIAYwhBAYMJiXoEE3ptobmT823mj0JHvGPZ zGWv+q/+IoU5LIlrOxu2rAxhtZrnJ+GtJRD1iV84mQc3VSNeQautstVYHSwvEk+fcMoD RrCN1XvWdLT/aJf9SRsJ9xIcRGhTSJVVivkTxnvgn7ZS0GgixKmgmiU2XU0bgiwjB27T GHV2Lm+g9/wLL017B8vMg32SpfijiisQi8bcwDjtDY3B15kx/wpLspEb7ZHVQxmze2hk LFTyE449EP2oha7/VUWarOZa8YtIYbRlC+q/sVBOudz0tVz5mZD8R0vx1qYU479ZBLIV ZQEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=zqor7JbA; 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 r16si12048476pgq.616.2018.01.11.05.40.31; Thu, 11 Jan 2018 05:40:31 -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=zqor7JbA; 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 S934223AbeAKNj7 (ORCPT + 28 others); Thu, 11 Jan 2018 08:39:59 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:21222 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751607AbeAKNj4 (ORCPT ); Thu, 11 Jan 2018 08:39:56 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0BDdnaQ002436; Thu, 11 Jan 2018 22:39:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0BDdnaQ002436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515677990; bh=xmbxBYJ2/yjaGGGDXV7NvXHUmcEH04QM4bolXFZinFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zqor7JbAM559qofK8LZmarBYgSaJTkXBud5l8gSqJdqsN5fnAFGOXu+WRbXCMuMY4 F5hNPj0ZSVKHftN6Mf6jlzPUf8tm1G5lj/Nst2ctyYHzNF37mSSGeOhmfWxijR5ITd /scP4MUiK6OMu8i8kcpznpBHMBILkwy8B9RKJPKKrqzbITwSPz9Ctgor9P7I0RQe8o EME6Np10x47kNplgfoP+Wkv890Axf3r9kvTOTZsgLhA+FtXLYiX0khZdZvwyMy3Cb2 N8FAT71or2g2jCrDz9OjSXKBin79MTf0kuXylHHoJm+NXIIV7WdIlPixF1S0J7YuIu MsEbS50hsIkeQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] kconfig: make xfgets() really static Date: Thu, 11 Jan 2018 22:39:40 +0900 Message-Id: <1515677981-21952-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515677981-21952-1-git-send-email-yamada.masahiro@socionext.com> References: <1515677981-21952-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 Sparse reports: warning: symbol 'xfgets' was not declared. Should it be static? It is declared as static, but it is missing in the definition part. Move the definition up and remove the forward declaration. Signed-off-by: Masahiro Yamada --- scripts/kconfig/conf.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 31c09c6..01ed336 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -20,7 +20,6 @@ static void conf(struct menu *menu); static void check_conf(struct menu *menu); -static void xfgets(char *str, int size, FILE *in); enum input_mode { oldaskconfig, @@ -83,6 +82,13 @@ static void check_stdin(void) } } +/* Helper function to facilitate fgets() by Jean Sacren. */ +static void xfgets(char *str, int size, FILE *in) +{ + if (!fgets(str, size, in)) + fprintf(stderr, "\nError in reading or end of file.\n"); +} + static int conf_askvalue(struct symbol *sym, const char *def) { enum symbol_type type = sym_get_type(sym); @@ -705,12 +711,3 @@ int main(int ac, char **av) } return 0; } - -/* - * Helper function to facilitate fgets() by Jean Sacren. - */ -void xfgets(char *str, int size, FILE *in) -{ - if (fgets(str, size, in) == NULL) - fprintf(stderr, "\nError in reading or end of file.\n"); -} From patchwork Thu Jan 11 13:39:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124205 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp693765qgn; Thu, 11 Jan 2018 05:40:06 -0800 (PST) X-Google-Smtp-Source: ACJfBothATsh7bU+7T8QOjy+rfuJmMS3Vo4mmQFJC++bVp7kAg12ssvnlE2a7bbFjycxMAKWCt3g X-Received: by 10.98.61.208 with SMTP id x77mr15380651pfj.2.1515678005923; Thu, 11 Jan 2018 05:40:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515678005; cv=none; d=google.com; s=arc-20160816; b=SoQIg//eVMXIlXXwX51kgI1cq3cyiZg9wXXuBRe3j3341cnzo7qwc5pqSijvmqbnri EeA3dnCoYDlPtbGxvw9XTADToZc+jdMnJMYF3nojPbvQPjNbumxF6vw2uhMET4CWO4kn JnXIoNMh3qPGQ995KIhzXuqwvOZp5wdrA9h/b+qbVIdYsFMIoNez2N4PTkZJqysQ8rUt wCyhuh8Ij9aO77OrVX9JC9hNoTb/CiefLjUDd/noX3vjYh+mDxv8JzuDZKF6CS3Jmjs/ 3qXIajwqq945Lbk05pMaouFStLVyT/EZ+67865V/aa8EFJeoEiy7AN0MU1olG/VWy6iz FSoA== 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 :arc-authentication-results; bh=uQXMLNs55xtg+Ye6ldFyCrd/rW2MUbf/LZ3oJ4wrcZU=; b=xVgQTvzzhnJXdxOfF71LRAxd4CFOqSP0geuxPPLd8RTbiDhTLl4nRE6ceVfAa6Qpl8 51ioabRWbh5bewP9/JJfBaoj0pQxlW9ICAHyd6gHsS7Ez5pejn/BdCXx1niULrCzD5NT YIqL7Q+bXt/ZubG2StgUlL0OOy73jeuFF9AJJPyRDqo5sbwQu92vpH/jGb255X/fLtSK 6ut2OfsITuG6NAezaxxQ93rBWgnxAmsPhCAjj/yGuwX3n3UwubiFfGnxlMFW6CYuhdKm ogw/FHWQeYhKkWhV4GdSfXGH6dfKX0ETUYbrXfI6F8s+L04L5kkyL1eJBm6BXduCrFRY WUnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=uMssfxCf; 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 r16si12048476pgq.616.2018.01.11.05.40.05; Thu, 11 Jan 2018 05:40:05 -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=uMssfxCf; 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 S1753045AbeAKNkC (ORCPT + 28 others); Thu, 11 Jan 2018 08:40:02 -0500 Received: from conuserg-08.nifty.com ([210.131.2.75]:21223 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754029AbeAKNj4 (ORCPT ); Thu, 11 Jan 2018 08:39:56 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-08.nifty.com with ESMTP id w0BDdnaR002436; Thu, 11 Jan 2018 22:39:51 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com w0BDdnaR002436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515677991; bh=uQXMLNs55xtg+Ye6ldFyCrd/rW2MUbf/LZ3oJ4wrcZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uMssfxCfShScv3Me1uys7WCMi+V4NEfvqFJudBSLmaNq3MsGZkKAsl/bLezPFgAyq /lZkT6qo53L2Gum+aUrILC3YESdh4fX8wZI9mcPYMwGYQE6EDEWvcMGRTNo0oEJBYC a+EZRfi2T7QV9SiTvJ0pT2rg0B2JaghUTFffc9F3tnd5tq4kNImQbasBzLk1eiVjck dv1WxbpkFffA0jI9flu6aE4XQUkm0Yr7HjE78XnM5n5Z6Q9p5TczaHzmEqtQRreNf1 LueeTp+WXGlsW4Bmoez9WSTHE/rQfC2qhkUibJxaf+DEX938tL9OP5YVowYHkIkQ9l SPAbkuDzuZyiA== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] kconfig: make conf_unsaved a local variable of conf_read() Date: Thu, 11 Jan 2018 22:39:41 +0900 Message-Id: <1515677981-21952-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515677981-21952-1-git-send-email-yamada.masahiro@socionext.com> References: <1515677981-21952-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 conf_unsaved is initialized by conf_read_simple(), but it is possible to move it to conf_read() so that it can be a local variable. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index bc83965..dfccaab 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -28,7 +28,7 @@ static void conf_message(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); static const char *conf_filename; -static int conf_lineno, conf_warnings, conf_unsaved; +static int conf_lineno, conf_warnings; const char conf_defname[] = "arch/$ARCH/defconfig"; @@ -290,7 +290,6 @@ int conf_read_simple(const char *name, int def) conf_filename = name; conf_lineno = 0; conf_warnings = 0; - conf_unsaved = 0; def_flags = SYMBOL_DEF << def; for_all_symbols(i, sym) { @@ -409,6 +408,7 @@ int conf_read_simple(const char *name, int def) int conf_read(const char *name) { struct symbol *sym; + int conf_unsaved = 0; int i; sym_set_change_count(0);