From patchwork Thu Jan 11 13:05:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124195 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp653210qgn; Thu, 11 Jan 2018 05:06:51 -0800 (PST) X-Google-Smtp-Source: ACJfBotIZ6+4YR68TZ57tX9NNY6DMOaLg3T+dLh4pZ3hEVLpJjyyAmgNUzvDBXEQaG7nIq8djV5w X-Received: by 10.99.181.78 with SMTP id u14mr17497133pgo.369.1515676011299; Thu, 11 Jan 2018 05:06:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515676011; cv=none; d=google.com; s=arc-20160816; b=KQZB85DG35dTpRcyd1PSj0UKMgfcGtSwy96gdYSIMOsMsgywBfz96j37DwkDmKRrXd Rw0xJ85BwhtDq8qwtACiMdyKnlTTdSln3VkYaCq7xCZWoWmueoJ1ph/1+UqOACNcIDOr HW4B33njRhlBwWpCXG5+SpznuuCX5rzPPg+598QMmScU85KQ95qy9wgiwWkv3tKsqa0c koAMnVny4jxVD5061db7dX9T5v2OSwkMY1SBUPMYdsuD9lXPBxs5A1sw0teFAb73Xx6B sHDpmXhZ5cBNb9f6hd36JHKzCSaW4wd3yvme5YekouoQhydtl9eBItlNdfMIgbQyEQnn dJ6A== 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=lFzmbu+hsRyXmSwbN26MonbD0ojlAbbvAfPvKUib1ok=; b=PunsbQzuG3HY+bzvqqJbHNqw41DkSernfzDuwSvEemw0C684SAFl8ZYXYED8HlXwg+ 3K31Fmkj738fEMOswtfFuUOUMLbpGvLYbAknL+4M5XVkmtIS//5WOdXJzDSvhxHNF8et awaYItnVMNXENPAv5mtAuvUAobBUdWwsqto5wIkBNtP8oP77yGiiDDA4k/KFU6YNpn2T 6SuHm2qqm6LyBA12K09ggTxx9ApZTByZGZ+82hChlZaXanSotEJq7BRlG7qT8XrZ38xx oQUhKE34jRbm4KA7iKYcBadxmxicLOFEuQW+NqKck/ljgU8jEoNPTEZqRAvzecyHhYUg 6oqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=kKcgGPDl; 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 z21si4293066pge.348.2018.01.11.05.06.50; Thu, 11 Jan 2018 05:06: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=kKcgGPDl; 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 S934449AbeAKNGt (ORCPT + 28 others); Thu, 11 Jan 2018 08:06:49 -0500 Received: from conuserg-12.nifty.com ([210.131.2.79]:60734 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932665AbeAKNGc (ORCPT ); Thu, 11 Jan 2018 08:06:32 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-12.nifty.com with ESMTP id w0BD5mX4031475; Thu, 11 Jan 2018 22:05:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w0BD5mX4031475 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515675950; bh=lFzmbu+hsRyXmSwbN26MonbD0ojlAbbvAfPvKUib1ok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kKcgGPDlDsf/Gqsui3I1vw3MgK/mb5qskTBaOdz/qLgfL2LS7rtSL6U+nVbr8+65b Z337E0zNIWpneACqp6A05DZyUmKlhFDHbyNLKmo+ia9BPfy/zr4yU0t3T+sSCXqYpO hWnVwCae6fmUQeosdWg9/VomvLxzsm6c7ACdL0Kp7L2IIFyK4SOhJysm5NB7cSMc2E tRESfO8DvPe/nPjCyg5XHW2eWsaapgiJ+mLmMvLNRPVTbFzYwCmd0DPG1gHBJynHA9 xz7RJt5Qu+ixs/aHe7Dnc6RlBBs5pPfQT4Zl3RuLoIXMFb/qhXbvpi94n985u+D3hV SZS7YAvIXxiyA== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Sam Ravnborg , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 4/7] fixdep: remove unneeded memcpy() in parse_dep_file() Date: Thu, 11 Jan 2018 22:05:43 +0900 Message-Id: <1515675946-7514-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515675946-7514-1-git-send-email-yamada.masahiro@socionext.com> References: <1515675946-7514-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 Each token in the depfile is copied to the temporary buffer 's' to terminate the token with zero. We do not need to do this any more because the parsed buffer is now writable. Insert '\0' directly in the buffer without calling memcpy(). is no longer necessary. (It was needed for PATH_MAX). Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/basic/fixdep.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 9f9238e..dfba77b 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -109,7 +109,6 @@ #include #include #include -#include #include int insert_extra_deps; @@ -304,7 +303,6 @@ static void *read_file(const char *filename) static void parse_dep_file(char *m) { char *p; - char s[PATH_MAX]; int is_last, is_target; int saw_any_target = 0; int is_first_dep = 0; @@ -330,16 +328,14 @@ static void parse_dep_file(char *m) /* The /next/ file is the first dependency */ is_first_dep = 1; } else { - /* Save this token/filename */ - memcpy(s, m, p-m); - s[p - m] = 0; + *p = '\0'; /* Ignore certain dependencies */ - if (strrcmp(s, "include/generated/autoconf.h") && - strrcmp(s, "include/generated/autoksyms.h") && - strrcmp(s, "arch/um/include/uml-config.h") && - strrcmp(s, "include/linux/kconfig.h") && - strrcmp(s, ".ver")) { + if (strrcmp(m, "include/generated/autoconf.h") && + strrcmp(m, "include/generated/autoksyms.h") && + strrcmp(m, "arch/um/include/uml-config.h") && + strrcmp(m, "include/linux/kconfig.h") && + strrcmp(m, ".ver")) { /* * Do not list the source file as dependency, * so that kbuild is not confused if a .c file @@ -360,15 +356,15 @@ static void parse_dep_file(char *m) if (!saw_any_target) { saw_any_target = 1; printf("source_%s := %s\n\n", - target, s); + target, m); printf("deps_%s := \\\n", target); } is_first_dep = 0; } else - printf(" %s \\\n", s); + printf(" %s \\\n", m); - buf = read_file(s); + buf = read_file(m); parse_config_file(buf); free(buf); }