From 3e50a591d9f0c0b22bbf93d09eef7d2286f3716c Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 25 Jun 2019 11:09:22 +0200 Subject: [PATCH] readelf: avoid shadowing a libiberty symbol MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit With my (oldish) gcc I'm seeing .../binutils/readelf.c: In function ‘dump_ctf_indent_lines’: .../binutils/readelf.c:13851: error: declaration of ‘spaces’ shadows a global declaration .../binutils/../include/libiberty.h:253: error: shadowed declaration is here --- binutils/ChangeLog | 5 +++++ binutils/readelf.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 611fc9b..63822e4 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,10 @@ 2019-06-25 Jan Beulich + * readelf.c (dump_ctf_indent_lines): Rename local variable + "spaces" to "blanks". + +2019-06-25 Jan Beulich + * objdump.c (dump_ctf_indent_lines): Rename local variable "spaces" to "blanks". diff --git a/binutils/readelf.c b/binutils/readelf.c index 4ed948c..5e8fe82 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -13848,10 +13848,10 @@ shdr_to_ctf_sect (ctf_sect_t *buf, Elf_Internal_Shdr *shdr, Filedata *filedata) static char *dump_ctf_indent_lines (ctf_sect_names_t sect ATTRIBUTE_UNUSED, char *s, void *arg) { - char *spaces = arg; + const char *blanks = arg; char *new_s; - if (asprintf (&new_s, "%s%s", spaces, s) < 0) + if (asprintf (&new_s, "%s%s", blanks, s) < 0) return s; return new_s; } -- 2.7.4