diff options
| author | Tom Tromey <tom@tromey.com> | 2016-09-24 21:28:52 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2016-10-12 19:59:29 -0600 |
| commit | af533a5f8b149bfa1394ab04c3947e97dd507a33 (patch) | |
| tree | f3352ae5be9752a1b5cbad72a64255bcdc4dc3c0 /gdb/machoread.c | |
| parent | d1a760cbb796b62f18ff6b81a189fd261809ef74 (diff) | |
| download | binutils-gdb-af533a5f8b149bfa1394ab04c3947e97dd507a33.tar.gz | |
Use std::string in macho_symfile_read_all_oso
This changes macho_symfile_read_all_oso to use std::string. This
avoids a cleanup.
2016-10-12 Tom Tromey <tom@tromey.com>
* machoread.c (macho_symfile_read_all_oso): Use std::string.
Diffstat (limited to 'gdb/machoread.c')
| -rw-r--r-- | gdb/machoread.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gdb/machoread.c b/gdb/machoread.c index 8abae479cbc..2eff5346f50 100644 --- a/gdb/machoread.c +++ b/gdb/machoread.c @@ -33,6 +33,7 @@ #include "psympriv.h" #include "complaints.h" #include "gdb_bfd.h" +#include <string> /* If non-zero displays debugging message. */ static unsigned int mach_o_debug_level = 0; @@ -635,7 +636,6 @@ macho_symfile_read_all_oso (VEC (oso_el) **oso_vector_ptr, int ix; VEC (oso_el) *vec = *oso_vector_ptr; oso_el *oso; - struct cleanup *cleanup = make_cleanup (null_cleanup, NULL); /* Sort oso by name so that files from libraries are gathered. */ qsort (VEC_address (oso_el, vec), VEC_length (oso_el, vec), @@ -651,37 +651,33 @@ macho_symfile_read_all_oso (VEC (oso_el) **oso_vector_ptr, { bfd *archive_bfd; bfd *member_bfd; - char *archive_name = XNEWVEC (char, pfx_len + 1); int last_ix; oso_el *oso2; int ix2; - memcpy (archive_name, oso->name, pfx_len); - archive_name[pfx_len] = '\0'; - - make_cleanup (xfree, archive_name); + std::string archive_name (oso->name, pfx_len); /* Compute number of oso for this archive. */ for (last_ix = ix; VEC_iterate (oso_el, vec, last_ix, oso2); last_ix++) { - if (strncmp (oso2->name, archive_name, pfx_len) != 0) + if (strncmp (oso2->name, archive_name.c_str (), pfx_len) != 0) break; } /* Open the archive and check the format. */ - archive_bfd = gdb_bfd_open (archive_name, gnutarget, -1); + archive_bfd = gdb_bfd_open (archive_name.c_str (), gnutarget, -1); if (archive_bfd == NULL) { warning (_("Could not open OSO archive file \"%s\""), - archive_name); + archive_name.c_str ()); ix = last_ix; continue; } if (!bfd_check_format (archive_bfd, bfd_archive)) { warning (_("OSO archive file \"%s\" not an archive."), - archive_name); + archive_name.c_str ()); gdb_bfd_unref (archive_bfd); ix = last_ix; continue; @@ -692,7 +688,7 @@ macho_symfile_read_all_oso (VEC (oso_el) **oso_vector_ptr, if (member_bfd == NULL) { warning (_("Could not read archive members out of " - "OSO archive \"%s\""), archive_name); + "OSO archive \"%s\""), archive_name.c_str ()); gdb_bfd_unref (archive_bfd); ix = last_ix; continue; @@ -756,8 +752,6 @@ macho_symfile_read_all_oso (VEC (oso_el) **oso_vector_ptr, ix++; } } - - do_cleanups (cleanup); } /* DSYM (debug symbols) files contain the debug info of an executable. |