aboutsummaryrefslogtreecommitdiff
path: root/gdb/infrun.c
diff options
context:
space:
mode:
authorSimon Marchi <simark@simark.ca>2016-09-16 15:44:29 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2016-09-16 15:44:29 -0400
commitcd94f6d535d1ebd8f252185cd84d21fe0df3c893 (patch)
tree617d4e6f8e0d6b7b644458ccff368c73fc9f9539 /gdb/infrun.c
parent325fac504a327de9c46a4e5cf9c88ece9d9d7701 (diff)
downloadgdb-cd94f6d535d1ebd8f252185cd84d21fe0df3c893.zip
gdb-cd94f6d535d1ebd8f252185cd84d21fe0df3c893.tar.gz
gdb-cd94f6d535d1ebd8f252185cd84d21fe0df3c893.tar.bz2
Introduce cleanup to restore current_uiout
Make a globally available cleanup from a pre-existing one in infrun.c. This is used in a following patch. gdb/ChangeLog: * infrun.c (restore_current_uiout_cleanup): Move to ui-out.c. (print_stop_event): Use make_cleanup_restore_current_uiout. * python/python.c (execute_gdb_command): Likewise. * ui-out.c (restore_current_uiout_cleanup): Move from infrun.c. (make_cleanup_restore_current_uiout): New function definition. * ui-out.h (make_cleanup_restore_current_uiout): New function declaration. * utils.c (do_restore_ui_out): Remove. (make_cleanup_restore_ui_out): Remove. * utils.h (make_cleanup_restore_ui_out): Remove.
Diffstat (limited to 'gdb/infrun.c')
-rw-r--r--gdb/infrun.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 70d7a09..ec37ca1 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -8096,16 +8096,6 @@ print_stop_location (struct target_waitstatus *ws)
print_stack_frame (get_selected_frame (NULL), 0, source_flag, 1);
}
-/* Cleanup that restores a previous current uiout. */
-
-static void
-restore_current_uiout_cleanup (void *arg)
-{
- struct ui_out *saved_uiout = (struct ui_out *) arg;
-
- current_uiout = saved_uiout;
-}
-
/* See infrun.h. */
void
@@ -8118,7 +8108,7 @@ print_stop_event (struct ui_out *uiout)
get_last_target_status (&last_ptid, &last);
- old_chain = make_cleanup (restore_current_uiout_cleanup, current_uiout);
+ old_chain = make_cleanup_restore_current_uiout ();
current_uiout = uiout;
print_stop_location (&last);