From patchwork Thu May 17 06:16:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 136116 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1884937lji; Wed, 16 May 2018 23:28:27 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp6I6+UjMxFXNhpZLE6LdEhTvxwrgtUw9hTGjhn32ok2xERYbhDC1pMUEN5XUjlrOem8mPn X-Received: by 2002:a17:902:9a4c:: with SMTP id x12-v6mr3901258plv.213.1526538506886; Wed, 16 May 2018 23:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526538506; cv=none; d=google.com; s=arc-20160816; b=N38QX6J1RTp0Ii9iLo1Vq87Oq4lU5ujIy7+CRgYOfdCU+U7jzfDanShPryTTIoaBoP WhWEKCnyQTpNYPBbxXrDU6SjRPXrHv6aM/RVrrM1MMeaKSk5vrxgA2RhW519pcv76A4O vdB9NW0SNx+G2WyDhDTzv+ycR2gXbap8YHzQKl3jr5wBtpo9UCVdiI0+zeTGjisCeeDz v4wh84DvXelLv81h9GOxBAXFGvpDVWXPdVpMa++k/8OUZw2cvxas/CaDd0u0ODyjTsqA 4/TYt1Y9eMoFsrxogkAxKTMbvG049QC6JcmqFhvXd8t0nuTi4KgptCxmoamSi4auBb5F pyxw== 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=zsrI7avFRHVJOVAyOUShxZMujly4akMfTew9t6oN0lQ=; b=U0PBR6oZwx8LM5+WoLFD/lywDf1AOnRSMLNxKd2B5fR0cDLpYKYJjZbBNmsRkyD49c DvmLwo8YDPhu5ttEmw6lwo3gxap164cQOCWU10x017d80F2KtO15F1afgk5lwpMViBrv 1KRfhcWE716Re0GaW6Hb0i7jKhqk26RAY3aqmJV8GTvPqPKPPjcsgvwn1lMlUyz+1wqQ dMcHseQ6++Gs3b2oRGgyXrMwoGh2+kO9/FXpUIjaXnD0lzsOMuYaGdDimQYDe40DZXHw VecWY92yY8Hd9sFPmAzpFNQoe15gJKDMpZiia4cpAtcet4q89FAScBRrWb/ypGcmywPN wo4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vRy7qFvu; 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 o5-v6si3369458pgn.134.2018.05.16.23.28.26; Wed, 16 May 2018 23:28:26 -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=vRy7qFvu; 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 S1752587AbeEQG2X (ORCPT + 29 others); Thu, 17 May 2018 02:28:23 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:24197 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751097AbeEQGSv (ORCPT ); Thu, 17 May 2018 02:18:51 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w4H6HbU4002841; Thu, 17 May 2018 15:17:44 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w4H6HbU4002841 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1526537864; bh=zsrI7avFRHVJOVAyOUShxZMujly4akMfTew9t6oN0lQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vRy7qFvuBLTFVJM4yeeZgJO9XncWhYOOhmWcQpIzKEeM+0HlMIJ0SEUnCI+ksyLrf tyc9WmVuxB2M+8qUE6z9MjVuSkTQexf7EocaLQzWEpn0t0LOLWf5I+nd6wWs6DtAUf bO2u9FXdDCwfs2rfj7o6a6lcyhlUQbXC3BlpQJia2y5Xv4f4oFTDSD2ty5XfDGie1X JQLqsn7SHGcN53wCLVuTkIQLLTF75BSqXzlVNhh5hMgsFiFdK+EdLGqxHOOThTc13m saXFoVgMyAGm8jlMLOaeicpLR2envUoPATvkKFdz4jIWh0aYFGM/EAXiPnaLMqIB81 y6pmSGjWuBxuw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Linus Torvalds , Sam Ravnborg , Ulf Magnusson , "Luis R . Rodriguez" , linux-kernel@vger.kernel.org, Nicholas Piggin , Kees Cook , Emese Revfy , x86@kernel.org, Masahiro Yamada Subject: [PATCH v4 06/31] kconfig: remove sym_expand_string_value() Date: Thu, 17 May 2018 15:16:45 +0900 Message-Id: <1526537830-22606-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526537830-22606-1-git-send-email-yamada.masahiro@socionext.com> References: <1526537830-22606-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 There is no more caller of sym_expand_string_value(). Signed-off-by: Masahiro Yamada --- Changes in v4: None Changes in v3: - newly added Changes in v2: None scripts/kconfig/lkc_proto.h | 1 - scripts/kconfig/symbol.c | 53 --------------------------------------------- 2 files changed, 54 deletions(-) -- 2.7.4 Reviewed-by: Kees Cook diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index 9f465fe..c46929f 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h @@ -31,7 +31,6 @@ extern struct symbol * symbol_hash[SYMBOL_HASHSIZE]; struct symbol * sym_lookup(const char *name, int flags); struct symbol * sym_find(const char *name); -char *sym_expand_string_value(const char *in); const char * sym_escape_string_value(const char *in); struct symbol ** sym_re_search(const char *pattern); const char * sym_type_name(enum symbol_type type); diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 2460648..7c9a88e 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -879,59 +879,6 @@ struct symbol *sym_find(const char *name) return symbol; } -/* - * Expand symbol's names embedded in the string given in argument. Symbols' - * name to be expanded shall be prefixed by a '$'. Unknown symbol expands to - * the empty string. - */ -char *sym_expand_string_value(const char *in) -{ - const char *src; - char *res; - size_t reslen; - - /* - * Note: 'in' might come from a token that's about to be - * freed, so make sure to always allocate a new string - */ - reslen = strlen(in) + 1; - res = xmalloc(reslen); - res[0] = '\0'; - - while ((src = strchr(in, '$'))) { - char *p, name[SYMBOL_MAXLENGTH]; - const char *symval = ""; - struct symbol *sym; - size_t newlen; - - strncat(res, in, src - in); - src++; - - p = name; - while (isalnum(*src) || *src == '_') - *p++ = *src++; - *p = '\0'; - - sym = sym_find(name); - if (sym != NULL) { - sym_calc_value(sym); - symval = sym_get_string_value(sym); - } - - newlen = strlen(res) + strlen(symval) + strlen(src) + 1; - if (newlen > reslen) { - reslen = newlen; - res = xrealloc(res, reslen); - } - - strcat(res, symval); - in = src; - } - strcat(res, in); - - return res; -} - const char *sym_escape_string_value(const char *in) { const char *p;