From e321e7ce753f27ca9664ca08a8314924b5771d61 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 5 Jul 2019 17:36:16 -0600 Subject: [PATCH] Remove tui_erase_exec_info_content One call to tui_erase_exec_info_content can be removed. This call is not needed because the function in question then immediately sets the execution info window contents. Once this is done, tui_clear_exec_info_content is just a wrapper for the only call to tui_erase_exec_info_content, so tui_erase_exec_info_content can be renamed and the wrapper function removed. gdb/ChangeLog 2019-08-13 Tom Tromey * tui/tui-winsource.h (tui_erase_exec_info_content): Don't declare. * tui/tui-winsource.c (tui_source_window_base::refresh_all): Don't call tui_erase_exec_info_content. (tui_clear_exec_info_content): Rename from tui_erase_exec_info_content. (tui_clear_exec_info_content): Delete. --- gdb/ChangeLog | 10 ++++++++++ gdb/tui/tui-winsource.c | 9 +-------- gdb/tui/tui-winsource.h | 1 - 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a739724..4f5231f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2019-08-13 Tom Tromey + * tui/tui-winsource.h (tui_erase_exec_info_content): Don't + declare. + * tui/tui-winsource.c (tui_source_window_base::refresh_all): Don't + call tui_erase_exec_info_content. + (tui_clear_exec_info_content): Rename from + tui_erase_exec_info_content. + (tui_clear_exec_info_content): Delete. + +2019-08-13 Tom Tromey + * tui/tui-winsource.h (struct tui_source_window_base) : Declare. (tui_show_exec_info_content): Don't declare. diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index c99e207..ed2af06 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -334,7 +334,6 @@ tui_source_window_base::refresh_all () { show_source_content (); check_and_display_highlight_if_needed (); - tui_erase_exec_info_content (this); update_exec_info (); } @@ -657,7 +656,7 @@ tui_source_window_base::show_exec_info_content () void -tui_erase_exec_info_content (struct tui_source_window_base *win_info) +tui_clear_exec_info_content (struct tui_source_window_base *win_info) { struct tui_gen_win_info *exec_info = win_info->execution_info; @@ -665,12 +664,6 @@ tui_erase_exec_info_content (struct tui_source_window_base *win_info) exec_info->refresh_window (); } -void -tui_clear_exec_info_content (struct tui_source_window_base *win_info) -{ - tui_erase_exec_info_content (win_info); -} - /* Function to update the execution info window. */ void tui_source_window_base::update_exec_info () diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index c902ee0..d8a84b0 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -188,7 +188,6 @@ extern void tui_update_source_windows_with_line (struct symtab *, int); extern void tui_clear_source_content (struct tui_source_window_base *); extern void tui_erase_source_content (struct tui_source_window_base *); -extern void tui_erase_exec_info_content (struct tui_source_window_base *); extern void tui_clear_exec_info_content (struct tui_source_window_base *); extern void tui_alloc_source_buffer (struct tui_source_window_base *); -- 2.7.4