diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/cli/cli-script.c | 6 | ||||
| -rw-r--r-- | gdb/top.c | 19 | ||||
| -rw-r--r-- | gdb/top.h | 2 |
4 files changed, 11 insertions, 23 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9337365..4459acc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 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. + +2017-08-03 Tom Tromey <tom@tromey.com> + * cli/cli-script.c (execute_user_command) (execute_control_command): Use scoped_restore. diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index d8dfbfc..4b8ae0b 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 @@ -444,27 +444,14 @@ quit_cover (void) event-top.c into this file, top.c. */ /* static */ const char *source_file_name; -/* Clean up on error during a "source" command (or execution of a - user-defined command). */ - -void -do_restore_instream_cleanup (void *stream) -{ - struct ui *ui = current_ui; - - /* Restore the previous input stream. */ - ui->instream = (FILE *) stream; -} - /* Read commands from STREAM. */ void read_command_file (FILE *stream) { struct ui *ui = current_ui; - struct cleanup *cleanups; - cleanups = make_cleanup (do_restore_instream_cleanup, ui->instream); - ui->instream = stream; + scoped_restore save_instream + = make_scoped_restore (&ui->instream, stream); /* Read commands from `instream' and execute them until end of file or error reading instream. */ @@ -479,8 +466,6 @@ read_command_file (FILE *stream) break; command_handler (command); } - - do_cleanups (cleanups); } void (*pre_init_ui_hook) (void); @@ -290,8 +290,6 @@ extern void show_history (char *, int); extern void set_verbose (char *, int, struct cmd_list_element *); -extern void do_restore_instream_cleanup (void *stream); - extern char *handle_line_of_input (struct buffer *cmd_line_buffer, char *rl, int repeat, const char *annotation_suffix); |