diff options
| author | Tom Tromey <tom@tromey.com> | 2017-08-03 16:53:22 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-08-22 09:30:12 -0600 |
| commit | 14278e1fdbe045df184d6dd546ff6a1e9e3c3797 (patch) | |
| tree | 9d736376600a484749b60ce7fe0902ae52650d68 /gdb/dwarf2read.c | |
| parent | 4971c9a74b47103582834e46d0185390379e60b3 (diff) | |
| download | fsf-binutils-gdb-14278e1fdbe045df184d6dd546ff6a1e9e3c3797.zip fsf-binutils-gdb-14278e1fdbe045df184d6dd546ff6a1e9e3c3797.tar.gz fsf-binutils-gdb-14278e1fdbe045df184d6dd546ff6a1e9e3c3797.tar.bz2 | |
Change gdb_realpath to return a unique_xmalloc_ptr
This changes gdb_realpath to return a unique_xmalloc_ptr and fixes up
the callers. This allows removing some cleanups. This change by
itself caused xfullpath.exp to fail; and attempting to fix that ran
into various problems (like .get() being optimized out); so this patch
also rewrites xfullpath.exp to be a C++ selftest instead.
ChangeLog
2017-08-22 Tom Tromey <tom@tromey.com>
* exec.c (exec_file_attach): Update.
* linux-thread-db.c (try_thread_db_load): Update.
* guile/scm-safe-call.c (gdbscm_safe_source_script): Update.
* utils.c (gdb_realpath): Change return type.
(gdb_realpath_keepfile): Update.
(gdb_realpath_check_trailer, gdb_realpath_tests): New functions.
(_initialize_utils): Register the new self test.
* source.c (openp): Update.
(find_and_open_source): Update.
* nto-tdep.c (nto_find_and_open_solib): Update.
* main.c (set_gdb_data_directory): Update.
(captured_main_1): Update.
* dwarf2read.c (dwarf2_get_dwz_file): Update
(dw2_map_symbol_filenames): Update.
* auto-load.c (auto_load_safe_path_vec_update): Update.
(filename_is_in_auto_load_safe_path_vec): Change type of
"filename_realp".
(auto_load_objfile_script): Update.
(file_is_auto_load_safe): Update. Use std::string.
* utils.h (gdb_realpath): Return a gdb::unique_xmalloc_ptr.
testsuite/ChangeLog
2017-08-22 Tom Tromey <tom@tromey.com>
* gdb.gdb/xfullpath.exp: Remove.
Diffstat (limited to 'gdb/dwarf2read.c')
| -rw-r--r-- | gdb/dwarf2read.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 0e28144..3822850 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2717,10 +2717,10 @@ dwarf2_get_dwz_file (void) std::string abs_storage; if (!IS_ABSOLUTE_PATH (filename)) { - char *abs = gdb_realpath (objfile_name (dwarf2_per_objfile->objfile)); + gdb::unique_xmalloc_ptr<char> abs + = gdb_realpath (objfile_name (dwarf2_per_objfile->objfile)); - make_cleanup (xfree, abs); - abs_storage = ldirname (abs) + SLASH_STRING + filename; + abs_storage = ldirname (abs.get ()) + SLASH_STRING + filename; filename = abs_storage.c_str (); } @@ -3589,7 +3589,7 @@ dw2_get_real_path (struct objfile *objfile, qfn->num_file_names, const char *); if (qfn->real_names[index] == NULL) - qfn->real_names[index] = gdb_realpath (qfn->file_names[index]); + qfn->real_names[index] = gdb_realpath (qfn->file_names[index]).release (); return qfn->real_names[index]; } @@ -4383,13 +4383,11 @@ dw2_map_symbol_filenames (struct objfile *objfile, symbol_filename_ftype *fun, dwarf2_per_objfile->filenames_cache->traverse ([&] (const char *filename) { - const char *this_real_name; + gdb::unique_xmalloc_ptr<char> this_real_name; if (need_fullname) this_real_name = gdb_realpath (filename); - else - this_real_name = NULL; - (*fun) (filename, this_real_name, data); + (*fun) (filename, this_real_name.get (), data); }); } |