Patchwork [review] Simplify tui_update_source_windows_with_addr

login
register
mail settings
Submitter Simon Marchi (Code Review)
Date Nov. 14, 2019, 11:35 p.m.
Message ID <gerrit.1573774548000.Id2ba6b3145ec005dbed1b1115118bd1ef4efb842@gnutoolchain-gerrit.osci.io>
Download mbox | patch
Permalink /patch/35921/
State New
Headers show

Comments

Simon Marchi (Code Review) - Nov. 14, 2019, 11:35 p.m.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/641
......................................................................

Simplify tui_update_source_windows_with_addr

After the previous changes, tui_update_source_windows_with_addr simply
updates each source-like window separately, passing the same data to
each.  So, it can be simplified by using a loop instead.

gdb/ChangeLog
2019-11-14  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.c (tui_update_source_windows_with_addr):
	Simplify.

Change-Id: Id2ba6b3145ec005dbed1b1115118bd1ef4efb842
---
M gdb/ChangeLog
M gdb/tui/tui-winsource.c
2 files changed, 9 insertions(+), 13 deletions(-)

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1bc528d..358a90f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@ 
 2019-11-14  Tom Tromey  <tom@tromey.com>
 
+	* tui/tui-winsource.c (tui_update_source_windows_with_addr):
+	Simplify.
+
+2019-11-14  Tom Tromey  <tom@tromey.com>
+
 	* tui/tui-winsource.h (struct tui_source_window_base)
 	<set_contents, update_source_window_as_is, update_source_window>:
 	Take a sal, not a separate symtab and tui_line_or_address.
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 0039f96..e1b19cd 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -199,21 +199,12 @@ 
 void
 tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
+  struct symtab_and_line sal {};
   if (addr != 0)
-    {
-      struct symtab_and_line sal = find_pc_line (addr, 0);
-      
-      if (TUI_DISASM_WIN != nullptr)
-	TUI_DISASM_WIN->update_source_window (gdbarch, sal);
+    sal = find_pc_line (addr, 0);
 
-      if (TUI_SRC_WIN != nullptr)
-	TUI_SRC_WIN->update_source_window (gdbarch, sal);
-    }
-  else
-    {
-      for (struct tui_source_window_base *win_info : tui_source_windows ())
-	win_info->erase_source_content ();
-    }
+  for (struct tui_source_window_base *win_info : tui_source_windows ())
+    win_info->update_source_window (gdbarch, sal);
 }
 
 /* Function to ensure that the source and/or disassemly windows