Messages in this thread Patch in this message | | | From | Vinson Lee <> | Subject | [PATCH] perf config: Fix build with older toolchain. | Date | Mon, 4 Apr 2016 22:07:39 +0000 |
| |
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 <vlee@freedesktop.org> --- 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
| |