This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Use scoped_restore in a couple of interp-related places


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

commit 753ff9bd837e2ba183e3ff789847a81221561392
Author: Tom Tromey <tom@tromey.com>
Date:   Sun Apr 29 23:12:04 2018 -0600

    Use scoped_restore in a couple of interp-related places
    
    While looking through the "interp" code I found a couple of spots that
    could use scoped_restore.
    
    ChangeLog
    2018-05-25  Tom Tromey  <tom@tromey.com>
    
    	* cli/cli-interp.c (safe_execute_command): Use scoped_restore.
    	* interps.c (interp_exec): Use scoped_restore.

Diff:
---
 gdb/ChangeLog        |  5 +++++
 gdb/cli/cli-interp.c |  8 ++------
 gdb/interps.c        | 13 +++----------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b697326..3e199b6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2018-05-25  Tom Tromey  <tom@tromey.com>
 
+	* cli/cli-interp.c (safe_execute_command): Use scoped_restore.
+	* interps.c (interp_exec): Use scoped_restore.
+
+2018-05-25  Tom Tromey  <tom@tromey.com>
+
 	* remote.c (remote_target::remote_file_get): Use
 	gdb::byte_vector.
 	(remote_target::remote_file_put): Likewise.
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index bbee809..0663301 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -356,11 +356,10 @@ safe_execute_command (struct ui_out *command_uiout, const char *command,
 		      int from_tty)
 {
   struct gdb_exception e = exception_none;
-  struct ui_out *saved_uiout;
 
   /* Save and override the global ``struct ui_out'' builder.  */
-  saved_uiout = current_uiout;
-  current_uiout = command_uiout;
+  scoped_restore saved_uiout = make_scoped_restore (&current_uiout,
+						    command_uiout);
 
   TRY
     {
@@ -372,9 +371,6 @@ safe_execute_command (struct ui_out *command_uiout, const char *command,
     }
   END_CATCH
 
-  /* Restore the global builder.  */
-  current_uiout = saved_uiout;
-
   /* FIXME: cagney/2005-01-13: This shouldn't be needed.  Instead the
      caller should print the exception.  */
   exception_print (gdb_stderr, e);
diff --git a/gdb/interps.c b/gdb/interps.c
index 61db7f4..162cd83 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -354,18 +354,11 @@ interp_exec (struct interp *interp, const char *command_str)
 {
   struct ui_interp_info *ui_interp = get_current_interp_info ();
 
-  struct gdb_exception ex;
-  struct interp *save_command_interp;
-
   /* See `command_interp' for why we do this.  */
-  save_command_interp = ui_interp->command_interpreter;
-  ui_interp->command_interpreter = interp;
-
-  ex = interp->exec (command_str);
-
-  ui_interp->command_interpreter = save_command_interp;
+  scoped_restore save_command_interp
+    = make_scoped_restore (&ui_interp->command_interpreter, interp);
 
-  return ex;
+  return interp->exec (command_str);
 }
 
 /* A convenience routine that nulls out all the common command hooks.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]