diff options
| author | Tom Tromey <tom@tromey.com> | 2017-08-13 14:40:46 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-09-11 16:15:08 -0600 |
| commit | be0d7abb5e3b0be4cb928845e70a9134f1b19700 (patch) | |
| tree | 0452caa65b7bef568c9f1c9667f97d2db5e8ba76 /gdb/cli | |
| parent | 00f675ff65ff6f78712a46e9699856e935d86d86 (diff) | |
| download | gdb-be0d7abb5e3b0be4cb928845e70a9134f1b19700.zip gdb-be0d7abb5e3b0be4cb928845e70a9134f1b19700.tar.gz gdb-be0d7abb5e3b0be4cb928845e70a9134f1b19700.tar.bz2 | |
Replace interp_set_temp with scoped_restore_interp
This removes interp_set_temp and an associated cleanup, in favor of a
new RAII class, scoped_restore_interp.
ChangeLog
2017-09-11 Tom Tromey <tom@tromey.com>
* cli/cli-script.c (restore_interp): Remove.
(read_command_lines): Use scoped_restore_interp.
* interps.c (scoped_restore_interp::set_temp): Rename from
interp_set_temp.
* interps.h (class scoped_restore_interp): New.
(interp_set_temp): Remove.
Diffstat (limited to 'gdb/cli')
| -rw-r--r-- | gdb/cli/cli-script.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index 02f66cc..dc3e856 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -1158,12 +1158,6 @@ recurse_read_control_structure (char * (*read_next_line_func) (void), return ret; } -static void -restore_interp (void *arg) -{ - interp_set_temp (interp_name ((struct interp *)arg)); -} - /* Read lines from the input stream and accumulate them in a chain of struct command_line's, which is then returned. For input from a terminal, the special command "end" is used to mark the end of the @@ -1203,12 +1197,10 @@ read_command_lines (char *prompt_arg, int from_tty, int parse_commands, validator, closure); else { - struct interp *old_interp = interp_set_temp (INTERP_CONSOLE); - struct cleanup *old_chain = make_cleanup (restore_interp, old_interp); + scoped_restore_interp interp_restorer (INTERP_CONSOLE); head = read_command_lines_1 (read_next_line, parse_commands, validator, closure); - do_cleanups (old_chain); } if (from_tty && input_interactive_p (current_ui) |