[binutils-gdb] Remove cleanups from execute_gdb_command

[Tom Tromey <tromey at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1ac32117f7224620f44ac966b5ca53df6e4fc5bd

commit 1ac32117f7224620f44ac966b5ca53df6e4fc5bd
Author: Tom Tromey <tom@tromey.com>
Date:   Mon Nov 28 21:11:53 2016 -0700

    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:
---
 gdb/ChangeLog       |  9 +++++++++
 gdb/breakpoint.c    |  2 +-
 gdb/command.h       |  2 +-
 gdb/guile/guile.c   |  2 +-
 gdb/python/python.c | 10 ++++------
 gdb/top.c           |  7 ++-----
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aaad4f8..06bff44 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
 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
 	free_to_mark.
 	(scoped_value_mark::free_to_mark): New method.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index cdd1511..867dbb9 100644
--- 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 0a07d21..2c86da4 100644
--- 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 bb55d1b..27c0a58 100644
--- 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 d382d48..ab5a6a4 100644
--- 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 ef8d856..f712bea 100644
--- 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);
 }