OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
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

8
gdb/cli/cli-interp.c
View File

@ -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);

13
gdb/interps.c
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.