Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756214AbcDDWHl (ORCPT ); Mon, 4 Apr 2016 18:07:41 -0400 Received: from gabe.freedesktop.org ([131.252.210.177]:54774 "EHLO gabe.freedesktop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752387AbcDDWHk (ORCPT ); Mon, 4 Apr 2016 18:07:40 -0400 From: Vinson Lee To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Taeung Song , Jiri Olsa , Josh Poimboeuf , Alexei Starovoitov , Wang Nan Cc: linux-kernel@vger.kernel.org Subject: [PATCH] perf config: Fix build with older toolchain. Date: Mon, 4 Apr 2016 22:07:39 +0000 Message-Id: <1459807659-9020-1-git-send-email-vlee@freedesktop.org> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1102 Lines: 33 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] Fixes: 9cb5987c8227 ("perf config: Rework buildid_dir_command_config to perf_buildid_config") Signed-off-by: Vinson Lee --- 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 5c20d783423b..a3d80a05e7a2 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 *v = perf_config_dirname(var, value); - if (!dirname) + if (!v) return -1; - strncpy(buildid_dir, dirname, MAXPATHLEN-1); + strncpy(buildid_dir, v, MAXPATHLEN-1); buildid_dir[MAXPATHLEN-1] = '\0'; } -- 1.7.9.5