diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/infrun.c | 14 | ||||
| -rw-r--r-- | gdb/python/python.c | 2 | ||||
| -rw-r--r-- | gdb/stack.c | 8 | ||||
| -rw-r--r-- | gdb/ui-out.c | 18 | ||||
| -rw-r--r-- | gdb/ui-out.h | 4 |
6 files changed, 16 insertions, 38 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5c87f32..4d65d93 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2016-10-21 Tom Tromey <tom@tromey.com> + * stack.c (print_stack_frame_to_uiout): Use scoped_restore. + * ui-out.c (make_cleanup_restore_current_uiout) + (restore_current_uiout_cleanup): Remove. + * infrun.c (print_stop_event): Use scoped_restore. + * ui-out.h (make_cleanup_restore_current_uiout): Don't declare. + +2016-10-21 Tom Tromey <tom@tromey.com> + * elfread.c (elf_read_minimal_symbols): Use gdb::unique_ptr. 2016-10-21 Tom Tromey <tom@tromey.com> diff --git a/gdb/infrun.c b/gdb/infrun.c index 3069b2d..00bba16 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -8084,22 +8084,20 @@ print_stop_location (struct target_waitstatus *ws) void print_stop_event (struct ui_out *uiout) { - struct cleanup *old_chain; struct target_waitstatus last; ptid_t last_ptid; struct thread_info *tp; get_last_target_status (&last_ptid, &last); - old_chain = make_cleanup_restore_current_uiout (); - current_uiout = uiout; - - print_stop_location (&last); + { + scoped_restore save_uiout = make_scoped_restore (¤t_uiout, uiout); - /* Display the auto-display expressions. */ - do_displays (); + print_stop_location (&last); - do_cleanups (old_chain); + /* Display the auto-display expressions. */ + do_displays (); + } tp = inferior_thread (); if (tp->thread_fsm != NULL diff --git a/gdb/python/python.c b/gdb/python/python.c index e478ec9..d6bd6bf 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -648,7 +648,7 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw) scoped_restore save_async = make_scoped_restore (¤t_ui->async, 0); - make_cleanup_restore_current_uiout (); + scoped_restore save_uiout = make_scoped_restore (¤t_uiout); /* Use the console interpreter uiout to have the same print format for console or MI. */ diff --git a/gdb/stack.c b/gdb/stack.c index 706dd51..823433d 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -149,15 +149,9 @@ print_stack_frame_to_uiout (struct ui_out *uiout, struct frame_info *frame, int print_level, enum print_what print_what, int set_current_sal) { - struct cleanup *old_chain; - - old_chain = make_cleanup_restore_current_uiout (); - - current_uiout = uiout; + scoped_restore save_uiout = make_scoped_restore (¤t_uiout, uiout); print_stack_frame (frame, print_level, print_what, set_current_sal); - - do_cleanups (old_chain); } /* Show or print a stack frame FRAME briefly. The output is formatted diff --git a/gdb/ui-out.c b/gdb/ui-out.c index f6d6050..932cf12 100644 --- a/gdb/ui-out.c +++ b/gdb/ui-out.c @@ -952,24 +952,6 @@ ui_out_destroy (struct ui_out *uiout) xfree (uiout); } -/* 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 ui-out.h. */ - -struct cleanup * -make_cleanup_restore_current_uiout (void) -{ - return make_cleanup (restore_current_uiout_cleanup, current_uiout); -} - /* Standard gdb initialization hook. */ void diff --git a/gdb/ui-out.h b/gdb/ui-out.h index 6a4d78a..9e1e74d 100644 --- a/gdb/ui-out.h +++ b/gdb/ui-out.h @@ -247,8 +247,4 @@ extern void ui_out_destroy (struct ui_out *uiout); extern int ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream); -/* Make a cleanup that restores the previous current uiout. */ - -extern struct cleanup *make_cleanup_restore_current_uiout (void); - #endif /* UI_OUT_H */ |