Remove make_cleanup_restore_current_ui

This removes make_cleanup_restore_current_ui by converting the last
use.  The last use was in a few functions used to iterate over all
UIs.  This patch replaces these functions with a class, and arranges
for the class destructor to do the needed cleanup.

2016-10-21  Tom Tromey  <tom@tromey.com>

	* tui/tui-interp.c (tui_on_normal_stop, tui_on_signal_received)
	(tui_on_end_stepping_range, tui_on_signal_exited, tui_on_exited)
	(tui_on_no_history, tui_on_user_selected_context_changed):
	Update.
	* top.h (switch_thru_all_uis): New class.
	(SWITCH_THRU_ALL_UIS): Rewrite.
	(make_cleanup_restore_current_ui, switch_thru_all_uis_init)
	(switch_thru_all_uis_cond, switch_thru_all_uis_next): Don't
	declare.
	* mi/mi-interp.c (mi_new_thread, mi_thread_exit)
	(mi_record_changed, mi_inferior_added, mi_inferior_appeared)
	(mi_inferior_exit, mi_inferior_removed, mi_on_signal_received)
	(mi_on_end_stepping_range, mi_on_signal_exited, mi_on_exited)
	(mi_on_no_history, mi_on_normal_stop, mi_traceframe_changed)
	(mi_tsv_created, mi_tsv_deleted, mi_tsv_modified)
	(mi_breakpoint_created, mi_breakpoint_deleted)
	(mi_breakpoint_modified, mi_output_running_pid, mi_on_resume)
	(mi_solib_loaded, mi_solib_unloaded, mi_command_param_changed)
	(mi_memory_changed, mi_user_selected_context_changed): Update.
	* infrun.c (all_uis_check_sync_execution_done)
	(all_uis_on_sync_execution_starting, normal_stop): Update.
	* event-top.c (restore_ui_cleanup)
	(make_cleanup_restore_current_ui, switch_thru_all_uis_init)
	(switch_thru_all_uis_cond, switch_thru_all_uis_next): Remove.
	* cli/cli-interp.c (cli_on_normal_stop, cli_on_signal_received)
	(cli_on_end_stepping_range, cli_on_signal_exited, cli_on_exited)
	(cli_on_no_history, cli_on_user_selected_context_changed):
	Update.
	* breakpoint.c (watchpoint_check): Update.
This commit is contained in:
Tom Tromey
2016-09-24 16:11:14 -06:00
parent 8dddcb8f00
commit 0e454242cc
8 changed files with 118 additions and 202 deletions

View File

@@ -447,56 +447,6 @@ struct ui *main_ui;
struct ui *current_ui;
struct ui *ui_list;
/* A cleanup handler that restores the current UI. */
static void
restore_ui_cleanup (void *data)
{
current_ui = (struct ui *) data;
}
/* See top.h. */
struct cleanup *
make_cleanup_restore_current_ui (void)
{
return make_cleanup (restore_ui_cleanup, current_ui);
}
/* See top.h. */
void
switch_thru_all_uis_init (struct switch_thru_all_uis *state)
{
state->iter = ui_list;
state->old_chain = make_cleanup_restore_current_ui ();
}
/* See top.h. */
int
switch_thru_all_uis_cond (struct switch_thru_all_uis *state)
{
if (state->iter != NULL)
{
current_ui = state->iter;
return 1;
}
else
{
do_cleanups (state->old_chain);
return 0;
}
}
/* See top.h. */
void
switch_thru_all_uis_next (struct switch_thru_all_uis *state)
{
state->iter = state->iter->next;
}
/* Get a pointer to the current UI's line buffer. This is used to
construct a whole line of input from partial input. */