[pushed] Remove tui_source_window::show_symtab_source
Sourceware to Gerrit sync (Code Review)
gerrit@gnutoolchain-gerrit.osci.io
Fri Dec 20 16:20:00 GMT 2019
Sourceware to Gerrit sync has submitted this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/637
......................................................................
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 <tom@tromey.com>
* 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)
<show_symtab_source>: Don't declare.
* tui/tui-source.c (tui_source_window::show_symtab_source):
Remove.
Change-Id: I41781df2126e8bafad46d058532d52602a288e06
---
M gdb/ChangeLog
M gdb/tui/tui-source.c
M gdb/tui/tui-source.h
M gdb/tui/tui-winsource.c
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 15e8894..5125089 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
2019-12-20 Tom Tromey <tom@tromey.com>
+ * 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)
+ <show_symtab_source>: Don't declare.
+ * tui/tui-source.c (tui_source_window::show_symtab_source):
+ Remove.
+
+2019-12-20 Tom Tromey <tom@tromey.com>
+
* tui/tui-winsource.c (tui_update_source_windows_with_addr): Call
update_source_window directly.
* tui/tui-disasm.h (tui_show_disassem): Don't declare.
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index a4d808f..062f26f 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -125,18 +125,6 @@
}
-/* 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 15d1429..a573ce4 100644
--- a/gdb/tui/tui-source.h
+++ b/gdb/tui/tui-source.h
@@ -56,9 +56,6 @@
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 b149936..9274678 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -227,7 +227,7 @@
{
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 @@
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);
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I41781df2126e8bafad46d058532d52602a288e06
Gerrit-Change-Number: 637
Gerrit-PatchSet: 3
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: merged
More information about the Gdb-patches
mailing list