From patchwork Mon May 27 14:37:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 165219 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp7256749ili; Mon, 27 May 2019 07:38:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqx007n7wbITRCumGQHpFXc/OmR5+tYBsiWT6tpM+gRhTdn9tbJotEJ/Q874aSaMO2UP7yZs X-Received: by 2002:a62:ae05:: with SMTP id q5mr21622241pff.13.1558967900373; Mon, 27 May 2019 07:38:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558967900; cv=none; d=google.com; s=arc-20160816; b=l2XXGXzKqK/k40OrXaccXF8vNoH/TG5wkfVv25H3GkfOu54oP1HIGrOC2VEduX9O9+ PmDechlcdAsjhyUHbwYbI+vTpZ57E65gKnuEbjG/GkEvusBCpibSrrqzt1MWB/PLvbJ1 fbMPopfSOirf6lM+U3TBbqDSuzYznfr3KXFL3LYr6n1fd/WeiNQlvdSGaaxigbJiA9Br iLAbg5+YrstkWqVhLNJJlSeksG/OKXuoWWmd/XejfUPkt/vdG9kKPklTenT6QrduHxeN ezziRD8Ppi76/yrvA+reLRYuwQsDGeHFjcUy4B3IvKjpMr8guJqzlK8AMR6+DBQfpcu0 mSaQ== 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=DU9a+ehsGx3Okk9wjGD1G/rqyMEkh0yNSRINEJbKkGc=; b=a0Z3FWHrav96EkXSeukgDpkvx4jsSaKfpS7evg2hgSe5MEOHaKrWVvTGjpehM4cbM9 1EqA/Q/RIshEo70U73yK/qRzq/zkEZ74tCpsMM+WmiB4cn4t3JU7WLOO/hC3ZjMR5Dyl Ddg0cPWN4cAnoSB/1wbPzjH7NDzgaspzOsifNJq4FBmeVEE1rljTNvX/R6ZfwXGE8p5A ikbc7qBPYs9GJDEYJMp5XNlK4u9K0B0S4WC5lUkfPb0R/r/rRHNaHodr1qCJj8tX0bJ5 rJXPQpG6UFj9dqjLAKIZtRoj7Ke9/7iAfax71KgRmxvXAG3IRN5Ume/QL3LIZvyptyq5 Mtfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=qZ4WTgT6; 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 v65si21376541pfb.77.2019.05.27.07.38.20; Mon, 27 May 2019 07:38:20 -0700 (PDT) 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=qZ4WTgT6; 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 S1726871AbfE0OiT (ORCPT + 30 others); Mon, 27 May 2019 10:38:19 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:41816 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726388AbfE0OiN (ORCPT ); Mon, 27 May 2019 10:38:13 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-07.nifty.com with ESMTP id x4REc8ho015915; Mon, 27 May 2019 23:38:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x4REc8ho015915 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1558967889; bh=DU9a+ehsGx3Okk9wjGD1G/rqyMEkh0yNSRINEJbKkGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qZ4WTgT62CY/O7HwwuI3OU8GBdXaqZElwEPEujDnHxzCVkxzBz4HmF5Bwrmlf+4h7 6W2GSuz2p1ZvvLmczd0raa75n9mxJgEg4mBJgZrxg/H6hU5n/xeJQlK3DJfY+uImCY u+OBXhZRLMH/Nt0dfhUFS4k5/oDJasGwG4czVRn3N7StHtJgKZ1XlBWrSqh0/sOUdE hrZqrKmZYNRshkbimd+TZvIzNLP8oEiWPhZEcYP4zs1CFDuaGTt91NIxwMwbrs56uF cJwI0OMuo4dBy58LY8IEola0tUSYXUdnqmrk6Rf02+RZCEBlZvfSq58ZTCpCs/wgGu 6dfZ4aiZeAyHQ== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 3/5] kconfig: add static qualifier to expand_string() Date: Mon, 27 May 2019 23:37:23 +0900 Message-Id: <20190527143725.12542-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190527143725.12542-1-yamada.masahiro@socionext.com> References: <20190527143725.12542-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now expand_string() is only used in preprocess.c Signed-off-by: Masahiro Yamada --- scripts/kconfig/lkc_proto.h | 1 - scripts/kconfig/preprocess.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index 86c267540ccc..38a32b1c1a28 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h @@ -58,7 +58,6 @@ void env_write_dep(FILE *f, const char *auto_conf_name); void variable_add(const char *name, const char *value, enum variable_flavor flavor); void variable_all_del(void); -char *expand_string(const char *in); char *expand_dollar(const char **str); char *expand_one_token(const char **str); diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c index 592dfbfa9fb3..0243086fb168 100644 --- a/scripts/kconfig/preprocess.c +++ b/scripts/kconfig/preprocess.c @@ -15,6 +15,7 @@ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) static char *expand_string_with_args(const char *in, int argc, char *argv[]); +static char *expand_string(const char *in); static void __attribute__((noreturn)) pperror(const char *format, ...) { @@ -550,7 +551,7 @@ static char *expand_string_with_args(const char *in, int argc, char *argv[]) return __expand_string(&in, is_end_of_str, argc, argv); } -char *expand_string(const char *in) +static char *expand_string(const char *in) { return expand_string_with_args(in, 0, NULL); }