diff options
| author | Tom Tromey <tom@tromey.com> | 2017-04-30 21:17:58 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-08-03 07:59:06 -0600 |
| commit | 3c9ebddd93ffb8b44b8cc69f3be9db08c861368e (patch) | |
| tree | 3f182a582c64e9464dbda668189714e76252d2c4 /gdb/cli | |
| parent | b51b225eb9b03b627967108ee3de38ada5de219d (diff) | |
Replace do_restore_instream_cleanup with scoped_restore
This changes the users of do_restore_instream_cleanup to use a
scoped_restore instead. This patch is broken out because it warrants
some additional attention: in particular it's unclear to me whether
current_ui can change in the body of these functions -- but if it can,
then the cleanup would have modified a different UI's instream member.
ChangeLog
2017-08-03 Tom Tromey <tom@tromey.com>
* top.h (do_restore_instream_cleanup): Remove.
* top.c (do_restore_instream_cleanup): Remove.
(read_command_file): Use scoped_restore.
* cli/cli-script.c (execute_user_command): Use scoped_restore.
Diffstat (limited to 'gdb/cli')
| -rw-r--r-- | gdb/cli/cli-script.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index d8dfbfc097..4b8ae0b1dc 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -377,7 +377,6 @@ execute_user_command (struct cmd_list_element *c, char *args) { struct ui *ui = current_ui; struct command_line *cmdlines; - struct cleanup *old_chain; enum command_control_type ret; extern unsigned int max_user_call_depth; @@ -393,8 +392,8 @@ execute_user_command (struct cmd_list_element *c, char *args) /* Set the instream to 0, indicating execution of a user-defined function. */ - old_chain = make_cleanup (do_restore_instream_cleanup, ui->instream); - ui->instream = NULL; + scoped_restore restore_instream + = make_scoped_restore (&ui->instream, nullptr); scoped_restore save_async = make_scoped_restore (¤t_ui->async, 0); @@ -410,7 +409,6 @@ execute_user_command (struct cmd_list_element *c, char *args) } cmdlines = cmdlines->next; } - do_cleanups (old_chain); } /* This function is called every time GDB prints a prompt. It ensures |