This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] dwarf2read.c (read_str_index): Rename local dwo_name to objf_name.
- From: Doug Evans <dje at google dot com>
- To: gdb-patches at sourceware dot org
- Date: Fri, 07 Mar 2014 17:35:07 -0800
- Subject: [commit] dwarf2read.c (read_str_index): Rename local dwo_name to objf_name.
- Authentication-results: sourceware.org; auth=none
Hi.
I noticed this while working on some tentative dwarf5 support.
Committed.
2014-03-07 Doug Evans <dje@google.com>
* dwarf2read.c (read_str_index): Rename local dwo_name to objf_name.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 92c7a83..705dc2d 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -16449,7 +16449,7 @@ read_str_index (const struct die_reader_specs *reader,
struct dwarf2_cu *cu, ULONGEST str_index)
{
struct objfile *objfile = dwarf2_per_objfile->objfile;
- const char *dwo_name = objfile_name (objfile);
+ const char *objf_name = objfile_name (objfile);
bfd *abfd = objfile->obfd;
struct dwarf2_section_info *str_section = &reader->dwo_file->sections.str;
struct dwarf2_section_info *str_offsets_section =
@@ -16463,15 +16463,15 @@ read_str_index (const struct die_reader_specs *reader,
if (str_section->buffer == NULL)
error (_("%s used without .debug_str.dwo section"
" in CU at offset 0x%lx [in module %s]"),
- form_name, (long) cu->header.offset.sect_off, dwo_name);
+ form_name, (long) cu->header.offset.sect_off, objf_name);
if (str_offsets_section->buffer == NULL)
error (_("%s used without .debug_str_offsets.dwo section"
" in CU at offset 0x%lx [in module %s]"),
- form_name, (long) cu->header.offset.sect_off, dwo_name);
+ form_name, (long) cu->header.offset.sect_off, objf_name);
if (str_index * cu->header.offset_size >= str_offsets_section->size)
error (_("%s pointing outside of .debug_str_offsets.dwo"
" section in CU at offset 0x%lx [in module %s]"),
- form_name, (long) cu->header.offset.sect_off, dwo_name);
+ form_name, (long) cu->header.offset.sect_off, objf_name);
info_ptr = (str_offsets_section->buffer
+ str_index * cu->header.offset_size);
if (cu->header.offset_size == 4)
@@ -16481,7 +16481,7 @@ read_str_index (const struct die_reader_specs *reader,
if (str_offset >= str_section->size)
error (_("Offset from %s pointing outside of"
" .debug_str.dwo section in CU at offset 0x%lx [in module %s]"),
- form_name, (long) cu->header.offset.sect_off, dwo_name);
+ form_name, (long) cu->header.offset.sect_off, objf_name);
return (const char *) (str_section->buffer + str_offset);
}