aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2019-06-25 11:08:53 +0200
committerJan Beulich <jbeulich@suse.com>2019-06-25 11:08:53 +0200
commit63160fc99678fd85311ad5c89494164e6f8439d7 (patch)
tree864cc7f1522dde4179a938d527753d877b2bb531 /binutils
parentx86: correct / adjust debug printing (diff)
downloadbinutils-gdb-63160fc99678fd85311ad5c89494164e6f8439d7.tar.gz
binutils-gdb-63160fc99678fd85311ad5c89494164e6f8439d7.tar.bz2
binutils-gdb-63160fc99678fd85311ad5c89494164e6f8439d7.zip
objdump: avoid shadowing a libiberty symbol
With my (oldish) gcc I'm seeing .../binutils/objdump.c: In function ‘dump_ctf_indent_lines’: .../binutils/objdump.c:3210: error: declaration of ‘spaces’ shadows a global declaration .../binutils/../include/libiberty.h:253: error: shadowed declaration is here
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/objdump.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b9e125fd614..611fc9b3205 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-25 Jan Beulich <jbeulich@suse.com>
+
+ * objdump.c (dump_ctf_indent_lines): Rename local variable
+ "spaces" to "blanks".
+
2019-06-14 Alan Modra <amodra@gmail.com>
* Makefile.in: Regenerate.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index d9c8cea3649..7a4e7e4b494 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -3207,10 +3207,10 @@ 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;
}