From: Tom Tromey <tom@tromey.com>
Date: Sun, 13 Aug 2017 17:04:37 +0000 (-0600)
Subject: Use std::string in mi_cmd_interpreter_exec
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=56496dd4d6519c26bb375a78588bf56b28b13512;p=binutils-gdb.git

Use std::string in mi_cmd_interpreter_exec

Change mi_cmd_interpreter_exec to use std::string, removing a cleanup.

ChangeLog
2017-09-03  Tom Tromey  <tom@tromey.com>

	* mi/mi-interp.c (mi_cmd_interpreter_exec): Use std::string.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 72b52f582fd..8d75d48406a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-09-03  Tom Tromey  <tom@tromey.com>
+
+	* mi/mi-interp.c (mi_cmd_interpreter_exec): Use std::string.
+
 2017-09-03  Tom Tromey  <tom@tromey.com>
 
 	* mi/mi-cmd-env.c (env_execute_cli_command): Use
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 959ae37376b..6b6d8f06222 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -206,8 +206,6 @@ mi_cmd_interpreter_exec (const char *command, char **argv, int argc)
 {
   struct interp *interp_to_use;
   int i;
-  char *mi_error_message = NULL;
-  struct cleanup *old_chain;
 
   if (argc < 2)
     error (_("-interpreter-exec: "
@@ -231,24 +229,22 @@ mi_cmd_interpreter_exec (const char *command, char **argv, int argc)
 
   /* Now run the code.  */
 
-  old_chain = make_cleanup (null_cleanup, 0);
+  std::string mi_error_message;
   for (i = 1; i < argc; i++)
     {
       struct gdb_exception e = interp_exec (interp_to_use, argv[i]);
 
       if (e.reason < 0)
 	{
-	  mi_error_message = xstrdup (e.message);
-	  make_cleanup (xfree, mi_error_message);
+	  mi_error_message = e.message;
 	  break;
 	}
     }
 
   mi_remove_notify_hooks ();
 
-  if (mi_error_message != NULL)
-    error ("%s", mi_error_message);
-  do_cleanups (old_chain);
+  if (!mi_error_message.empty ())
+    error ("%s", mi_error_message.c_str ());
 }
 
 /* This inserts a number of hooks that are meant to produce