aboutsummaryrefslogtreecommitdiff
path: root/gdb/cli/cli-interp.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/cli/cli-interp.c')
-rw-r--r--gdb/cli/cli-interp.c8
1 files changed, 2 insertions, 6 deletions
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);