Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966135AbcDMHOH (ORCPT ); Wed, 13 Apr 2016 03:14:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50244 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934016AbcDMHOD (ORCPT ); Wed, 13 Apr 2016 03:14:03 -0400 Date: Wed, 13 Apr 2016 00:12:57 -0700 From: tip-bot for Vinson Lee Message-ID: Cc: acme@redhat.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, treeze.taeung@gmail.com, mingo@kernel.org, jpoimboe@redhat.com, ast@plumgrid.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, wangnan0@huawei.com, vlee@freedesktop.org, tglx@linutronix.de Reply-To: peterz@infradead.org, alexander.shishkin@linux.intel.com, wangnan0@huawei.com, vlee@freedesktop.org, tglx@linutronix.de, jpoimboe@redhat.com, ast@plumgrid.com, linux-kernel@vger.kernel.org, hpa@zytor.com, jolsa@kernel.org, treeze.taeung@gmail.com, mingo@kernel.org, acme@redhat.com In-Reply-To: <1459807659-9020-1-git-send-email-vlee@freedesktop.org> References: <1459807659-9020-1-git-send-email-vlee@freedesktop.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf config: Fix build with older toolchain. Git-Commit-ID: d8e28654f28de74951ab1b7e59d2bebb442972aa X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1893 Lines: 49 Commit-ID: d8e28654f28de74951ab1b7e59d2bebb442972aa Gitweb: http://git.kernel.org/tip/d8e28654f28de74951ab1b7e59d2bebb442972aa Author: Vinson Lee AuthorDate: Mon, 4 Apr 2016 22:07:39 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 6 Apr 2016 10:44:28 -0300 perf config: Fix build with older toolchain. Fix build error on Ubuntu 12.04.5 with GCC 4.6.3. CC util/config.o util/config.c: In function ‘perf_buildid_config’: util/config.c:384:15: error: declaration of ‘dirname’ shadows a global declaration [-Werror=shadow] Signed-off-by: Vinson Lee Cc: Alexander Shishkin Cc: Alexei Starovoitov Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Peter Zijlstra Cc: Taeung Song Cc: Wang Nan Fixes: 9cb5987c8227 ("perf config: Rework buildid_dir_command_config to perf_buildid_config") Link: http://lkml.kernel.org/r/1459807659-9020-1-git-send-email-vlee@freedesktop.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 5c20d78..664490b 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -381,11 +381,11 @@ static int perf_buildid_config(const char *var, const char *value) { /* same dir for all commands */ if (!strcmp(var, "buildid.dir")) { - const char *dirname = perf_config_dirname(var, value); + const char *dir = perf_config_dirname(var, value); - if (!dirname) + if (!dir) return -1; - strncpy(buildid_dir, dirname, MAXPATHLEN-1); + strncpy(buildid_dir, dir, MAXPATHLEN-1); buildid_dir[MAXPATHLEN-1] = '\0'; }