diff options
| author | Tom Tromey <tom@tromey.com> | 2018-02-22 16:31:15 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-03-13 17:41:12 -0600 |
| commit | b577b6af8e7f4cc53e73ee01188d1700fb8d3b82 (patch) | |
| tree | e0c9db0a28e74b5b6e1f8153345e43b451a68928 /gdb/machoread.c | |
| parent | e45ad1239d7d8591d5e80d8cbba7d404c6c3640f (diff) | |
| download | gdb-b577b6af8e7f4cc53e73ee01188d1700fb8d3b82.zip gdb-b577b6af8e7f4cc53e73ee01188d1700fb8d3b82.tar.gz gdb-b577b6af8e7f4cc53e73ee01188d1700fb8d3b82.tar.bz2 | |
Remove two cleanups using std::string
This patches removes cleanups from a couple of spots by using
std::string rather than manual memory management.
Regression tested by the buildbot, though note that I don't believe
the buildbot actually exercises the machoread code.
gdb/ChangeLog
2018-03-13 Tom Tromey <tom@tromey.com>
* machoread.c (macho_check_dsym): Change filenamep to a
std::string*.
(macho_symfile_read): Update.
* symfile.c (load_command): Use std::string.
Diffstat (limited to 'gdb/machoread.c')
| -rw-r--r-- | gdb/machoread.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gdb/machoread.c b/gdb/machoread.c index b270675..ab4410c 100644 --- a/gdb/machoread.c +++ b/gdb/machoread.c @@ -750,12 +750,12 @@ macho_symfile_read_all_oso (VEC (oso_el) **oso_vector_ptr, #define DSYM_SUFFIX ".dSYM/Contents/Resources/DWARF/" /* Check if a dsym file exists for OBJFILE. If so, returns a bfd for it - and return *FILENAMEP with its original xmalloc-ated filename. + and return *FILENAMEP with its original filename. Return NULL if no valid dsym file is found (FILENAMEP is not used in such case). */ static gdb_bfd_ref_ptr -macho_check_dsym (struct objfile *objfile, char **filenamep) +macho_check_dsym (struct objfile *objfile, std::string *filenamep) { size_t name_len = strlen (objfile_name (objfile)); size_t dsym_len = strlen (DSYM_SUFFIX); @@ -804,7 +804,7 @@ macho_check_dsym (struct objfile *objfile, char **filenamep) objfile_name (objfile)); return NULL; } - *filenamep = xstrdup (dsym_filename); + *filenamep = std::string (dsym_filename); return dsym_bfd; } @@ -821,7 +821,7 @@ macho_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) be in the executable. */ if (bfd_get_file_flags (abfd) & (EXEC_P | DYNAMIC)) { - char *dsym_filename; + std::string dsym_filename; /* Process the normal symbol table first. */ storage_needed = bfd_get_symtab_upper_bound (objfile->obfd); @@ -865,8 +865,6 @@ macho_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) { struct bfd_section *asect, *dsect; - make_cleanup (xfree, dsym_filename); - if (mach_o_debug_level > 0) printf_unfiltered (_("dsym file found\n")); @@ -882,7 +880,7 @@ macho_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) } /* Add the dsym file as a separate file. */ - symbol_file_add_separate (dsym_bfd.get (), dsym_filename, + symbol_file_add_separate (dsym_bfd.get (), dsym_filename.c_str (), symfile_flags, objfile); /* Don't try to read dwarf2 from main file or shared libraries. */ |