Remove tui_display_data_from

tui_display_data_from is only called from a single place.  Inlining it
there lets us remove some uses of the TUI_DATA_WIN global.

gdb/ChangeLog
2019-07-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-windata.h (tui_display_data_from): Don't declare.
	* tui/tui-windata.c (tui_display_data_from): Remove.
	(tui_data_window::refresh_all): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d7df8fd..3daafb3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2019-07-17  Tom Tromey  <tom@tromey.com>
 
+       * tui/tui-windata.h (tui_display_data_from): Don't declare.
+       * tui/tui-windata.c (tui_display_data_from): Remove.
+       (tui_data_window::refresh_all): Update.
+
+2019-07-17  Tom Tromey  <tom@tromey.com>
+
        * tui/tui-windata.h (tui_display_data_from_line): Don't declare.
        * tui/tui-windata.c (tui_display_data_from_line): Remove.
        (tui_display_data_from, tui_data_window::do_scroll_vertical): Call

diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
index 4f18d73..722d0a5 100644 (file)
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -111,28 +111,6 @@ tui_display_all_data (void)
 }
 
 
-/* Display data starting at element element_no.  */
-void
-tui_display_data_from (int element_no, int reuse_windows)
-{
-  int first_line = (-1);
-
-  if (element_no < TUI_DATA_WIN->regs_content.size ())
-    first_line = TUI_DATA_WIN->line_from_reg_element_no (element_no);
-  else
-    { /* Calculate the first_line from the element number.  */
-    }
-
-  if (first_line >= 0)
-    {
-      tui_erase_data_content (NULL);
-      if (!reuse_windows)
-       tui_delete_data_content_windows ();
-      tui_display_registers_from_line (first_line);
-    }
-}
-
-
 /* Function to redisplay the contents of the data window.  */
 void
 tui_data_window::refresh_all ()
@@ -143,7 +121,18 @@ tui_data_window::refresh_all ()
       int first_element = first_data_item_displayed ();
 
       if (first_element >= 0)  /* Re-use existing windows.  */
-       tui_display_data_from (first_element, TRUE);
+       {
+         int first_line = (-1);
+
+         if (first_element < regs_content.size ())
+           first_line = line_from_reg_element_no (first_element);
+
+         if (first_line >= 0)
+           {
+             tui_erase_data_content (NULL);
+             tui_display_registers_from_line (first_line);
+           }
+       }
     }
 }
 

diff --git a/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h
index fd8e625..9970cfa 100644 (file)
--- a/gdb/tui/tui-windata.h
+++ b/gdb/tui/tui-windata.h
@@ -28,6 +28,5 @@ extern void tui_erase_data_content (const char *);
 extern void tui_display_all_data (void);
 extern void tui_delete_data_content_windows (void);
 extern void tui_refresh_data_win (void);
-extern void tui_display_data_from (int, int);
 
 #endif /* TUI_TUI_WINDATA_H */