From 469b073133fa35b54ab4f1bc3dee42ccede84689 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 12 Nov 2019 17:23:18 -0700 Subject: [PATCH] Remove tui_source_window::show_symtab_source tui_source_window::show_symtab_source is identical to update_source_window, so remove the former. gdb/ChangeLog 2019-12-20 Tom Tromey * tui/tui-winsource.c (tui_update_source_windows_with_addr) (tui_update_source_windows_with_line): Call update_source_window. * tui/tui-source.h (struct tui_source_window) : Don't declare. * tui/tui-source.c (tui_source_window::show_symtab_source): Remove. Change-Id: I41781df2126e8bafad46d058532d52602a288e06 --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-source.c | 12 ------------ gdb/tui/tui-source.h | 3 --- gdb/tui/tui-winsource.c | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 15e8894015..5125089b6f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2019-12-20 Tom Tromey + + * tui/tui-winsource.c (tui_update_source_windows_with_addr) + (tui_update_source_windows_with_line): Call update_source_window. + * tui/tui-source.h (struct tui_source_window) + : Don't declare. + * tui/tui-source.c (tui_source_window::show_symtab_source): + Remove. + 2019-12-20 Tom Tromey * tui/tui-winsource.c (tui_update_source_windows_with_addr): Call diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index a4d808faad..062f26f55e 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -125,18 +125,6 @@ tui_source_window::set_contents (struct gdbarch *arch, } -/* Function to display source in the source window. This function - initializes the horizontal scroll to 0. */ -void -tui_source_window::show_symtab_source (struct gdbarch *gdbarch, - struct symtab *s, - struct tui_line_or_address line) -{ - horizontal_offset = 0; - update_source_window_as_is (gdbarch, s, line); -} - - /* Answer whether the source is currently displayed in the source window. */ bool diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h index 15d14291d2..a573ce47f4 100644 --- a/gdb/tui/tui-source.h +++ b/gdb/tui/tui-source.h @@ -56,9 +56,6 @@ struct tui_source_window : public tui_source_window_base do_erase_source_content (_("[ No Source Available ]")); } - void show_symtab_source (struct gdbarch *, struct symtab *, - struct tui_line_or_address); - protected: void do_scroll_vertical (int num_to_scroll) override; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index b1499368f8..9274678aa9 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -227,7 +227,7 @@ tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr) { l.loa = LOA_LINE; l.u.line_no = sal.line; - TUI_SRC_WIN->show_symtab_source (gdbarch, sal.symtab, l); + TUI_SRC_WIN->update_source_window (gdbarch, sal.symtab, l); } } else @@ -261,7 +261,7 @@ tui_update_source_windows_with_line (struct symtab *s, int line) default: l.loa = LOA_LINE; l.u.line_no = line; - TUI_SRC_WIN->show_symtab_source (gdbarch, s, l); + TUI_SRC_WIN->update_source_window (gdbarch, s, l); if (tui_current_layout () == SRC_DISASSEM_COMMAND) { find_line_pc (s, line, &pc); -- 2.34.1