Don't cast a tui_win_info directly to tui_gen_win_info

[thirdparty/binutils-gdb.git] / gdb / tui / tui-wingeneral.c

diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index b6d3d0f475faa2a3ee39b397fdd741c98e79c974..cacc0b844540316e6e8003cc7ca19532a54d90cd 100644 (file)
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -1,6 +1,6 @@
 /* General window behavior.
 
-   Copyright (C) 1998-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -43,10 +43,9 @@ tui_refresh_win (struct tui_gen_win_info *win_info)
        {
          struct tui_gen_win_info *data_item_win_ptr;
 
-         data_item_win_ptr = &((tui_win_content)
-                               win_info->content)[i]->which_element.data_window;
+         data_item_win_ptr = &win_info->content[i]->which_element.data_window;
          if (data_item_win_ptr != NULL
-             && data_item_win_ptr->handle != (WINDOW *) NULL)
+             && data_item_win_ptr->handle != NULL)
            wrefresh (data_item_win_ptr->handle);
        }
     }
@@ -56,7 +55,7 @@ tui_refresh_win (struct tui_gen_win_info *win_info)
     }
   else
     {
-      if (win_info->handle != (WINDOW *) NULL)
+      if (win_info->handle != NULL)
        wrefresh (win_info->handle);
     }
 
@@ -68,7 +67,7 @@ tui_refresh_win (struct tui_gen_win_info *win_info)
 void
 tui_delete_win (WINDOW *window)
 {
-  if (window != (WINDOW *) NULL)
+  if (window != NULL)
     delwin (window);
 
   return;
@@ -111,9 +110,9 @@ void
 tui_unhighlight_win (struct tui_win_info *win_info)
 {
   if (win_info != NULL 
-      && win_info->generic.handle != (WINDOW *) NULL)
+      && win_info->generic.handle != NULL)
     {
-      box_win ((struct tui_gen_win_info *) win_info, NO_HILITE);
+      box_win (&win_info->generic, NO_HILITE);
       wrefresh (win_info->generic.handle);
       tui_set_win_highlight (win_info, 0);
     }
@@ -125,9 +124,9 @@ tui_highlight_win (struct tui_win_info *win_info)
 {
   if (win_info != NULL
       && win_info->can_highlight
-      && win_info->generic.handle != (WINDOW *) NULL)
+      && win_info->generic.handle != NULL)
     {
-      box_win ((struct tui_gen_win_info *) win_info, HILITE);
+      box_win (&win_info->generic, HILITE);
       wrefresh (win_info->generic.handle);
       tui_set_win_highlight (win_info, 1);
     }
@@ -158,7 +157,7 @@ tui_make_window (struct tui_gen_win_info *win_info, int box_it)
                   win_info->origin.y,
                   win_info->origin.x);
   win_info->handle = handle;
-  if (handle != (WINDOW *) NULL)
+  if (handle != NULL)
     {
       if (box_it == BOX_WINDOW)
        box_win (win_info, NO_HILITE);
@@ -190,7 +189,7 @@ make_visible (struct tui_gen_win_info *win_info, int visible)
     }
   else if (!visible
           && win_info->is_visible
-          && win_info->handle != (WINDOW *) NULL)
+          && win_info->handle != NULL)
     {
       win_info->is_visible = FALSE;
       tui_delete_win (win_info->handle);
@@ -228,7 +227,7 @@ make_all_visible (int visible)
          if (tui_win_is_source_type ((tui_win_list[i])->generic.type))
            make_visible ((tui_win_list[i])->detail.source_info.execution_info,
                          visible);
-         make_visible ((struct tui_gen_win_info *) tui_win_list[i], visible);
+         make_visible (&tui_win_list[i]->generic, visible);
        }
     }