Remove tui_first_data_element_no_in_line

[binutils-gdb.git] / gdb / tui / tui-windata.c

diff --git a/gdb/tui/tui-windata.c b/gdb/tui/tui-windata.c
index dadae6c4c091ab23ee94d9935a9ce7ac45ea0165..646adfbb74d0e155e9f35ccfdd091b5d812eef41 100644 (file)
--- a/gdb/tui/tui-windata.c
+++ b/gdb/tui/tui-windata.c
@@ -1,6 +1,6 @@
 /* Data/register window display.
 
-   Copyright (C) 1998-2017 Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -53,9 +53,9 @@ tui_first_data_item_displayed (void)
     {
       struct tui_gen_win_info *data_item_win;
 
-      data_item_win = &((tui_win_content)
-                       TUI_DATA_WIN->generic.content)[i]->which_element.data_window;
-      if (data_item_win->handle != (WINDOW *) NULL 
+      data_item_win
+       = &TUI_DATA_WIN->generic.content[i]->which_element.data_window;
+      if (data_item_win->handle != NULL
          && data_item_win->is_visible)
        element_no = i;
     }
@@ -64,23 +64,6 @@ tui_first_data_item_displayed (void)
 }
 
 
-/* Answer the index of the first element in line_no.  If line_no is
-   past the data area (-1) is returned.  */
-int
-tui_first_data_element_no_in_line (int line_no)
-{
-  int first_element_no = (-1);
-
-  /* First see if there is a register on line_no, and if so, set the
-     first element number.  */
-  if ((first_element_no = tui_first_reg_element_no_inline (line_no)) == -1)
-    { /* Looking at the general data, the 1st element on line_no.  */
-    }
-
-  return first_element_no;
-}
-
-
 /* Function to delete all the item windows in the data window.  This
    is usually done when the data window is scrolled.  */
 void
@@ -91,8 +74,8 @@ tui_delete_data_content_windows (void)
 
   for (i = 0; (i < TUI_DATA_WIN->generic.content_size); i++)
     {
-      data_item_win_ptr = &((tui_win_content)
-                           TUI_DATA_WIN->generic.content)[i]->which_element.data_window;
+      data_item_win_ptr
+       = &TUI_DATA_WIN->generic.content[i]->which_element.data_window;
       tui_delete_win (data_item_win_ptr->handle);
       data_item_win_ptr->handle = NULL;
       data_item_win_ptr->is_visible = FALSE;
@@ -101,11 +84,11 @@ tui_delete_data_content_windows (void)
 
 
 void
-tui_erase_data_content (char *prompt)
+tui_erase_data_content (const char *prompt)
 {
   werase (TUI_DATA_WIN->generic.handle);
   tui_check_and_display_highlight_if_needed (TUI_DATA_WIN);
-  if (prompt != (char *) NULL)
+  if (prompt != NULL)
     {
       int half_width = (TUI_DATA_WIN->generic.width - 2) / 2;
       int x_pos;
@@ -117,7 +100,7 @@ tui_erase_data_content (char *prompt)
       mvwaddstr (TUI_DATA_WIN->generic.handle,
                 (TUI_DATA_WIN->generic.height / 2),
                 x_pos,
-                prompt);
+                (char *) prompt);
     }
   wrefresh (TUI_DATA_WIN->generic.handle);
 }
@@ -132,14 +115,13 @@ tui_display_all_data (void)
     tui_erase_data_content (NO_DATA_STRING);
   else
     {
-      tui_erase_data_content ((char *) NULL);
+      tui_erase_data_content (NULL);
       tui_delete_data_content_windows ();
       tui_check_and_display_highlight_if_needed (TUI_DATA_WIN);
       tui_display_registers_from (0);
 
       /* Then display the other data.  */
-      if (TUI_DATA_WIN->detail.data_display_info.data_content !=
-         (tui_win_content) NULL 
+      if (TUI_DATA_WIN->detail.data_display_info.data_content != NULL
          && TUI_DATA_WIN->detail.data_display_info.data_content_count > 0)
        {
        }
@@ -201,7 +183,7 @@ tui_display_data_from (int element_no, int reuse_windows)
 
   if (first_line >= 0)
     {
-      tui_erase_data_content ((char *) NULL);
+      tui_erase_data_content (NULL);
       if (!reuse_windows)
        tui_delete_data_content_windows ();
       tui_display_data_from_line (first_line);
@@ -213,7 +195,7 @@ tui_display_data_from (int element_no, int reuse_windows)
 void
 tui_refresh_data_win (void)
 {
-  tui_erase_data_content ((char *) NULL);
+  tui_erase_data_content (NULL);
   if (TUI_DATA_WIN->generic.content_size > 0)
     {
       int first_element = tui_first_data_item_displayed ();
@@ -284,7 +266,7 @@ tui_vertical_data_scroll (enum tui_scroll_direction scroll_direction,
        first_line += num_to_scroll;
       else
        first_line -= num_to_scroll;
-      tui_erase_data_content ((char *) NULL);
+      tui_erase_data_content (NULL);
       tui_delete_data_content_windows ();
       tui_display_data_from_line (first_line);
     }