FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace do_restore_instream_cleanup with scoped_restore

Browse source 
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.
This commit is contained in:
Tom Tromey 2017-04-30 21:17:58 -06:00
parent b51b225eb9
commit 3c9ebddd93
4 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gdb/ChangeLog
View file

@ -1,3 +1,10 @@
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> 2017-08-03 Tom Tromey <tom@tromey.com>
* cli/cli-script.c (execute_user_command) * cli/cli-script.c (execute_user_command)

6
gdb/cli/cli-script.c
View file

@ -377,7 +377,6 @@ execute_user_command (struct cmd_list_element *c, char *args)
{ {
struct ui *ui = current_ui; struct ui *ui = current_ui;
struct command_line *cmdlines; struct command_line *cmdlines;
struct cleanup *old_chain;
enum command_control_type ret; enum command_control_type ret;
extern unsigned int max_user_call_depth; 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 /* Set the instream to 0, indicating execution of a
user-defined function. */ user-defined function. */
old_chain = make_cleanup (do_restore_instream_cleanup, ui->instream); scoped_restore restore_instream
ui->instream = NULL; = make_scoped_restore (&ui->instream, nullptr);
scoped_restore save_async = make_scoped_restore (&current_ui->async, 0); scoped_restore save_async = make_scoped_restore (&current_ui->async, 0);
@ -410,7 +409,6 @@ execute_user_command (struct cmd_list_element *c, char *args)
} }
cmdlines = cmdlines->next; cmdlines = cmdlines->next;
} }
do_cleanups (old_chain);
} }
/* This function is called every time GDB prints a prompt. It ensures /* This function is called every time GDB prints a prompt. It ensures

19
gdb/top.c
View file

@ -444,27 +444,14 @@ quit_cover (void)
event-top.c into this file, top.c. */ event-top.c into this file, top.c. */
/* static */ const char *source_file_name; /* 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. */ /* Read commands from STREAM. */
void void
read_command_file (FILE *stream) read_command_file (FILE *stream)
{ {
struct ui *ui = current_ui; struct ui *ui = current_ui;
struct cleanup *cleanups;
cleanups = make_cleanup (do_restore_instream_cleanup, ui->instream); scoped_restore save_instream
ui->instream = stream; = make_scoped_restore (&ui->instream, stream);
/* Read commands from `instream' and execute them until end of file /* Read commands from `instream' and execute them until end of file
or error reading instream. */ or error reading instream. */
@ -479,8 +466,6 @@ read_command_file (FILE *stream)
break; break;
command_handler (command); command_handler (command);
} }
do_cleanups (cleanups);
} }
void (*pre_init_ui_hook) (void); void (*pre_init_ui_hook) (void);

2
gdb/top.h
View file

@ -290,8 +290,6 @@ extern void show_history (char *, int);
extern void set_verbose (char *, int, struct cmd_list_element *); 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, extern char *handle_line_of_input (struct buffer *cmd_line_buffer,
char *rl, int repeat, char *rl, int repeat,
const char *annotation_suffix); const char *annotation_suffix);