diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-16 10:23:10 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-06-25 07:48:25 -0600 |
| commit | ec328aa512ee09ab326d59b417836bb950083230 (patch) | |
| tree | 255739a574e27d621a9d0a24375208833a05afb5 /gdb | |
| parent | 33b906abfa7721128791883875d90394f8e2e7c2 (diff) | |
| download | binutils-ec328aa512ee09ab326d59b417836bb950083230.zip binutils-ec328aa512ee09ab326d59b417836bb950083230.tar.gz binutils-ec328aa512ee09ab326d59b417836bb950083230.tar.bz2 | |
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.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/tui/tui-layout.c | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d01d118..45415df 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 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 protected. Make destructor virtual. Add initializers. (tui_source_window, tui_data_window, tui_cmd_window): New diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index bcae819..695c560 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -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; } |