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.
This commit is contained in:
Tom Tromey
2018-04-29 23:12:04 -06:00
parent 5ca3b2605c
commit 753ff9bd83
3 changed files with 10 additions and 16 deletions

View File

@@ -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;
scoped_restore save_command_interp
= make_scoped_restore (&ui_interp->command_interpreter, interp);
ex = interp->exec (command_str);
ui_interp->command_interpreter = save_command_interp;
return ex;
return interp->exec (command_str);
}
/* A convenience routine that nulls out all the common command hooks.