Remove an unnecessary NULL check from the TUI

In init_and_make_win, opaque_win_info can't be NULL after a new window
is allocated.  This patch removes an unnecessary NULL check.

gdb/ChangeLog
2019-06-25  Tom Tromey  <tom@tromey.com>

	* tui/tui-layout.c (init_and_make_win): Remove NULL check.
This commit is contained in:
Tom Tromey 2019-06-16 10:23:10 -06:00
parent 33b906abfa
commit ec328aa512
2 changed files with 12 additions and 10 deletions

View File

@ -1,3 +1,7 @@
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-layout.c (init_and_make_win): Remove NULL check.
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-data.h (struct tui_win_info): Make constructor

View File

@ -842,18 +842,16 @@ init_and_make_win (void *opaque_win_info,
else
generic = &((struct tui_win_info *) opaque_win_info)->generic;
if (opaque_win_info != NULL)
init_gen_win_info (generic, win_type, height, width, origin_x, origin_y);
if (!tui_win_is_auxillary (win_type))
{
init_gen_win_info (generic, win_type, height, width, origin_x, origin_y);
if (!tui_win_is_auxillary (win_type))
{
if (generic->type == CMD_WIN)
((struct tui_win_info *) opaque_win_info)->can_highlight = FALSE;
else
((struct tui_win_info *) opaque_win_info)->can_highlight = TRUE;
}
tui_make_window (generic, box_it);
if (generic->type == CMD_WIN)
((struct tui_win_info *) opaque_win_info)->can_highlight = FALSE;
else
((struct tui_win_info *) opaque_win_info)->can_highlight = TRUE;
}
tui_make_window (generic, box_it);
return opaque_win_info;
}