diff options
author | Tom Tromey <tom@tromey.com> | 2018-04-22 10:46:51 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2018-10-04 22:51:47 -0600 |
commit | 3fba72f7612c071f07fc7e65887bd1e8e056e272 (patch) | |
tree | 5f90a15ae6d5b84d320cbcef65b59784b9971618 /gdb/linux-tdep.c | |
parent | 795afcbbb4b6c9a47597b9da57221b1bf9fdc88f (diff) | |
download | gdb-3fba72f7612c071f07fc7e65887bd1e8e056e272.zip gdb-3fba72f7612c071f07fc7e65887bd1e8e056e272.tar.gz gdb-3fba72f7612c071f07fc7e65887bd1e8e056e272.tar.bz2 |
Avoid shadowing in linux-tdep.c
This is one of the uglier changes to avoid local shadowing. Because
obstack.h uses statement expressions, in some cases a nested obstack
call will result in shadowing. Rather than try to fix obstack.h, this
patch simply works around the one instance of this problem.
gdb/ChangeLog
2018-10-04 Tom Tromey <tom@tromey.com>
* linux-tdep.c (linux_make_mappings_corefile_notes): Introduce new
variable "size".
Diffstat (limited to 'gdb/linux-tdep.c')
-rw-r--r-- | gdb/linux-tdep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 8c76ec3..3521149 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -1547,8 +1547,9 @@ linux_make_mappings_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, long_type, mapping_data.file_count); /* Copy the filenames to the data obstack. */ + int size = obstack_object_size (&filename_obstack); obstack_grow (&data_obstack, obstack_base (&filename_obstack), - obstack_object_size (&filename_obstack)); + size); note_data = elfcore_write_note (obfd, note_data, note_size, "CORE", NT_FILE, |