Remove cleanup from try_open_exec_file

This removes a cleanup from try_open_exec_file, using std::string to
manage the storage instead.

gdb/ChangeLog
2018-09-13  Tom Tromey  <tom@tromey.com>

	* exec.c (try_open_exec_file): Use std::string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d087871f58c30da171b3180779bff4f006c1f538..f110b6484fbccdc36c69fdb352b82e79c0ba89c1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-13  Tom Tromey  <tom@tromey.com>
+
+       * exec.c (try_open_exec_file): Use std::string.
+
 2018-09-13  Tom Tromey  <tom@tromey.com>
 
        * utils.h (gdb_bfd_errmsg): Return std::string.

diff --git a/gdb/exec.c b/gdb/exec.c
index 6e44b0e821bec95d6b64425e2dfd953dfe15bba3..615fb2b5dbc9f23a8b44bda5367dd362fbef1233 100644 (file)
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -149,11 +149,8 @@ void
 try_open_exec_file (const char *exec_file_host, struct inferior *inf,
                    symfile_add_flags add_flags)
 {
-  struct cleanup *old_chain;
   struct gdb_exception prev_err = exception_none;
 
-  old_chain = make_cleanup (free_current_contents, &prev_err.message);
-
   /* exec_file_attach and symbol_file_add_main may throw an error if the file
      cannot be opened either locally or remotely.
 
@@ -165,6 +162,7 @@ try_open_exec_file (const char *exec_file_host, struct inferior *inf,
      Even without a symbol file, the remote-based debugging session should
      continue normally instead of ending abruptly.  Hence we catch thrown
      errors/exceptions in the following code.  */
+  std::string saved_message;
   TRY
     {
       /* We must do this step even if exec_file_host is NULL, so that
@@ -180,7 +178,10 @@ try_open_exec_file (const char *exec_file_host, struct inferior *inf,
 
       /* Save message so it doesn't get trashed by the catch below.  */
       if (err.message != NULL)
-       prev_err.message = xstrdup (err.message);
+       {
+         saved_message = err.message;
+         prev_err.message = saved_message.c_str ();
+       }
     }
   END_CATCH
 
@@ -197,8 +198,6 @@ try_open_exec_file (const char *exec_file_host, struct inferior *inf,
        }
       END_CATCH
     }
-
-  do_cleanups (old_chain);
 }
 
 /* See gdbcore.h.  */