From cfe826d45ea2e15f0df4c039dfa4b9ea605831da Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Sep 2016 08:33:13 -0600 Subject: [PATCH] Use std::vector in objfiles.c This patch changes a spot in objfiles.c to use a std::vector, removing a cleanup. 2016-09-23 Tom Tromey * objfiles.c: Include . (objfile_relocate): Use std::vector. --- gdb/ChangeLog | 5 +++++ gdb/objfiles.c | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ab90503d35f..161da29ed50 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-09-23 Tom Tromey + + * objfiles.c: Include . + (objfile_relocate): Use std::vector. + 2016-09-23 Tom Tromey * rust-lang.c: Include and . diff --git a/gdb/objfiles.c b/gdb/objfiles.c index f022d104fe0..71f771d8e21 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -53,6 +53,8 @@ #include "gdb_bfd.h" #include "btrace.h" +#include + /* Keep a registry of per-objfile data-pointers required by other GDB modules. */ @@ -943,7 +945,6 @@ objfile_relocate (struct objfile *objfile, debug_objfile = objfile_separate_debug_iterate (objfile, debug_objfile)) { struct section_addr_info *objfile_addrs; - struct section_offsets *new_debug_offsets; struct cleanup *my_cleanups; objfile_addrs = build_section_addr_info_from_objfile (objfile); @@ -956,15 +957,13 @@ objfile_relocate (struct objfile *objfile, gdb_assert (debug_objfile->num_sections == gdb_bfd_count_sections (debug_objfile->obfd)); - new_debug_offsets = - ((struct section_offsets *) - xmalloc (SIZEOF_N_SECTION_OFFSETS (debug_objfile->num_sections))); - make_cleanup (xfree, new_debug_offsets); - relative_addr_info_to_section_offsets (new_debug_offsets, + std::vector + new_debug_offsets (SIZEOF_N_SECTION_OFFSETS (debug_objfile->num_sections)); + relative_addr_info_to_section_offsets (new_debug_offsets.data (), debug_objfile->num_sections, objfile_addrs); - changed |= objfile_relocate1 (debug_objfile, new_debug_offsets); + changed |= objfile_relocate1 (debug_objfile, new_debug_offsets.data ()); do_cleanups (my_cleanups); }