From 7778b9128f46b1bb7af965ae3821f63b05c627ef Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 16 Jun 2019 11:29:45 -0600 Subject: [PATCH] Remove tui_clear_win_detail An earlier patch changed the context of the sole call to tui_clear_win_detail to make it clear that this can never be called with a NULL window pointer. So, remove tui_clear_win_detail in favor of calling the method directly. gdb/ChangeLog 2019-06-25 Tom Tromey * tui/tui-data.h (tui_clear_win_detail): Don't declare. * tui/tui-data.c (tui_clear_source_windows_detail): Call the clear_detail method directly. (tui_clear_win_detail): Remove. --- gdb/ChangeLog | 7 +++++++ gdb/tui/tui-data.c | 11 +---------- gdb/tui/tui-data.h | 1 - 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 56b49cd4a95..18bffd1e3a9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-06-25 Tom Tromey + + * tui/tui-data.h (tui_clear_win_detail): Don't declare. + * tui/tui-data.c (tui_clear_source_windows_detail): Call the + clear_detail method directly. + (tui_clear_win_detail): Remove. + 2019-06-25 Tom Tromey * tui/tui-disasm.c (tui_disasm_window::do_scroll_vertical): Use diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 1edf40b71b3..1e1bc0362a9 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -159,7 +159,7 @@ void tui_clear_source_windows_detail () { for (tui_win_info *win : tui_source_windows ()) - tui_clear_win_detail (win); + win->clear_detail (); } @@ -205,15 +205,6 @@ tui_data_window::clear_detail () detail.data_display_info.display_regs = FALSE; } -/* Clear the pertinant detail in the windows. */ -void -tui_clear_win_detail (struct tui_win_info *win_info) -{ - if (win_info != NULL) - win_info->clear_detail (); -} - - /* Accessor for the source execution info ptr. */ struct tui_gen_win_info * tui_source_exec_info_win_ptr (void) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 4170f246a11..c4ef455f2aa 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -439,7 +439,6 @@ extern struct tui_gen_win_info *tui_disassem_exec_info_win_ptr (void); extern std::vector &tui_source_windows (); extern void tui_clear_source_windows (void); extern void tui_clear_source_windows_detail (void); -extern void tui_clear_win_detail (struct tui_win_info *); extern void tui_add_to_source_windows (struct tui_win_info *); extern struct tui_win_info *tui_win_with_focus (void); extern void tui_set_win_with_focus (struct tui_win_info *); -- 2.30.2