From 0638b7f90293ac01233dc6406e4c9d5da0ed9e24 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 14 Aug 2017 00:18:06 -0600 Subject: [PATCH] Use std::string in reopen_exec_file This changes reopen_exec_file to use a std::string, removing a cleanup. ChangeLog 2017-09-03 Tom Tromey * corefile.c (reopen_exec_file): Use std::string. --- gdb/ChangeLog | 4 ++++ gdb/corefile.c | 11 +++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6e4f3940506..1a688df3e56 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-09-03 Tom Tromey + + * corefile.c (reopen_exec_file): Use std::string. + 2017-09-03 Tom Tromey * compile/compile.c (compile_register_name_mangled): Return diff --git a/gdb/corefile.c b/gdb/corefile.c index 5631347b587..0996f9c0212 100644 --- a/gdb/corefile.c +++ b/gdb/corefile.c @@ -130,29 +130,24 @@ specify_exec_file_hook (void (*hook) (const char *)) void reopen_exec_file (void) { - char *filename; int res; struct stat st; - struct cleanup *cleanups; /* Don't do anything if there isn't an exec file. */ if (exec_bfd == NULL) return; /* If the timestamp of the exec file has changed, reopen it. */ - filename = xstrdup (bfd_get_filename (exec_bfd)); - cleanups = make_cleanup (xfree, filename); - res = stat (filename, &st); + std::string filename = bfd_get_filename (exec_bfd); + res = stat (filename.c_str (), &st); if (res == 0 && exec_bfd_mtime && exec_bfd_mtime != st.st_mtime) - exec_file_attach (filename, 0); + exec_file_attach (filename.c_str (), 0); else /* If we accessed the file since last opening it, close it now; this stops GDB from holding the executable open after it exits. */ bfd_cache_close_all (); - - do_cleanups (cleanups); } /* If we have both a core file and an exec file, -- 2.30.2