Remove cleanups from execute_gdb_command

This replaces a cleanup in execute_gdb_command with an instance of
std::string.

Testing showed that this originally missed a cleanup that was returned
by prevent_dont_repeat.  This version of the patch changes
prevent_dont_repeat to return a scoped_restore rather than a cleanup.

2017-01-10  Tom Tromey  <tom@tromey.com>

	* top.c (prevent_dont_repeat): Change return type.
	* python/python.c (execute_gdb_command): Use std::string.
	Update.
	* guile/guile.c (gdbscm_execute_gdb_command): Update.
	* command.h (prevent_dont_repeat): Change return type.
	* breakpoint.c (bpstat_do_actions_1): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aaad4f87ae51025f9c9ef6103a634c782c4c9652..06bff449d244e31a72d669be4b726d96db1d4177 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2017-01-10  Tom Tromey  <tom@tromey.com>
+
+       * top.c (prevent_dont_repeat): Change return type.
+       * python/python.c (execute_gdb_command): Use std::string.
+       Update.
+       * guile/guile.c (gdbscm_execute_gdb_command): Update.
+       * command.h (prevent_dont_repeat): Change return type.
+       * breakpoint.c (bpstat_do_actions_1): Update.
+
 2017-01-10  Tom Tromey  <tom@tromey.com>
 
        * value.h (scoped_value_mark::~scoped_value_mark): Call

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index cdd1511eb894ed82f069df892226d13cbe617554..867dbb9a947d86fda1f93379b777be0215d78b5d 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4685,7 +4685,7 @@ bpstat_do_actions_1 (bpstat *bsp)
   executing_breakpoint_commands = 1;
   old_chain = make_cleanup (cleanup_executing_breakpoints, 0);
 
-  prevent_dont_repeat ();
+  scoped_restore preventer = prevent_dont_repeat ();
 
   /* This pointer will iterate over the list of bpstat's.  */
   bs = *bsp;

diff --git a/gdb/command.h b/gdb/command.h
index 0a07d2189871d6a42ef9715e265a57be026765ad..2c86da4550feee25ff7d50c274c3425164deee0c 100644 (file)
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -408,7 +408,7 @@ extern void error_no_arg (const char *) ATTRIBUTE_NORETURN;
 
 extern void dont_repeat (void);
 
-extern struct cleanup *prevent_dont_repeat (void);
+extern scoped_restore_tmpl<int> prevent_dont_repeat (void);
 
 /* Used to mark commands that don't do anything.  If we just leave the
    function field NULL, the command is interpreted as a help topic, or

diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c
index bb55d1b6455a2036904dc8abb0af6ec75a548482..27c0a589b9f827bce3899cae81b235fadc01e0c9 100644 (file)
--- a/gdb/guile/guile.c
+++ b/gdb/guile/guile.c
@@ -332,7 +332,7 @@ gdbscm_execute_gdb_command (SCM command_scm, SCM rest)
       inner_cleanups = make_cleanup_restore_integer (&current_ui->async);
       current_ui->async = 0;
 
-      prevent_dont_repeat ();
+      scoped_restore preventer = prevent_dont_repeat ();
       if (to_string)
        to_string_res = execute_command_to_string (command, from_tty);
       else

diff --git a/gdb/python/python.c b/gdb/python/python.c
index d382d4864d3bbf9be7f9c7defb70b2358e670044..ab5a6a416d81a693fab82624788f5d2f08dd1c63 100644 (file)
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -601,8 +601,7 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
   TRY
     {
       /* Copy the argument text in case the command modifies it.  */
-      char *copy = xstrdup (arg);
-      struct cleanup *cleanup = make_cleanup (xfree, copy);
+      std::string copy (arg);
       struct interp *interp;
 
       scoped_restore save_async = make_scoped_restore (&current_ui->async, 0);
@@ -614,12 +613,11 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
       interp = interp_lookup (current_ui, "console");
       current_uiout = interp_ui_out (interp);
 
-      prevent_dont_repeat ();
+      scoped_restore preventer = prevent_dont_repeat ();
       if (to_string)
-       to_string_res = execute_command_to_string (copy, from_tty);
+       to_string_res = execute_command_to_string (&copy[0], from_tty);
       else
-       execute_command (copy, from_tty);
-      do_cleanups (cleanup);
+       execute_command (&copy[0], from_tty);
     }
   CATCH (except, RETURN_MASK_ALL)
     {

diff --git a/gdb/top.c b/gdb/top.c
index ef8d8565d3dc77459119efad241fa31511e9059b..f712beafb621b897308e01ba0cb6ab33b8e45ba0 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -755,13 +755,10 @@ dont_repeat (void)
 /* Prevent dont_repeat from working, and return a cleanup that
    restores the previous state.  */
 
-struct cleanup *
+scoped_restore_tmpl<int>
 prevent_dont_repeat (void)
 {
-  struct cleanup *result = make_cleanup_restore_integer (&suppress_dont_repeat);
-
-  suppress_dont_repeat = 1;
-  return result;
+  return make_scoped_restore (&suppress_dont_repeat, 1);
 }
 
 \f