[tip:perf/core] perf config: Fix build with older toolchain.

[tip-bot for Vinson Lee]

Commit-ID:  d8e28654f28de74951ab1b7e59d2bebb442972aa
Gitweb:     http://git.kernel.org/tip/d8e28654f28de74951ab1b7e59d2bebb442972aa
Author:     Vinson Lee <v...@freedesktop.org>
AuthorDate: Mon, 4 Apr 2016 22:07:39 +0000
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
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 <v...@freedesktop.org>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Alexei Starovoitov <a...@plumgrid.com>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Josh Poimboeuf <jpoim...@redhat.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Taeung Song <treeze.tae...@gmail.com>
Cc: Wang Nan <wangn...@huawei.com>
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-v...@freedesktop.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 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';
        }