diff options
| author | Tom Tromey <tom@tromey.com> | 2019-07-15 15:59:53 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-08-30 12:57:05 -0600 |
| commit | 108e13abdf90acc44b1aba4a0f3ee1d49a0f7934 (patch) | |
| tree | 08afe52350c84a73e7208a9d19ba3750b399f99a | |
| parent | cdaa6eb4394c42b49b090181dbfaae4e327090de (diff) | |
| download | gdb-108e13abdf90acc44b1aba4a0f3ee1d49a0f7934.zip gdb-108e13abdf90acc44b1aba4a0f3ee1d49a0f7934.tar.gz gdb-108e13abdf90acc44b1aba4a0f3ee1d49a0f7934.tar.bz2 | |
Remove NULL checks from box_win
box_win can't be called with a NULL window, or with an invisible
window. So, the NULL checks in that function can be removed.
gdb/ChangeLog
2019-08-30 Tom Tromey <tom@tromey.com>
* tui/tui-wingeneral.c (box_win): Assume win_info and
win_info->handle cannot be NULL.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/tui/tui-wingeneral.c | 35 |
2 files changed, 21 insertions, 19 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 388f5eb..9c8299b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-08-30 Tom Tromey <tom@tromey.com> + * tui/tui-wingeneral.c (box_win): Assume win_info and + win_info->handle cannot be NULL. + +2019-08-30 Tom Tromey <tom@tromey.com> + * tui/tui-regs.h (struct tui_data_item_window) <rerender, refresh_window>: Declare. * tui/tui-regs.c (tui_data_window::display_registers_from): Call diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index ab0363f..01f288b 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -58,30 +58,27 @@ static void box_win (struct tui_win_info *win_info, bool highlight_flag) { - if (win_info && win_info->handle) - { - WINDOW *win; - int attrs; + WINDOW *win; + int attrs; - win = win_info->handle; - if (highlight_flag) - attrs = tui_active_border_attrs; - else - attrs = tui_border_attrs; + win = win_info->handle; + if (highlight_flag) + attrs = tui_active_border_attrs; + else + attrs = tui_border_attrs; - wattron (win, attrs); + wattron (win, attrs); #ifdef HAVE_WBORDER - wborder (win, tui_border_vline, tui_border_vline, - tui_border_hline, tui_border_hline, - tui_border_ulcorner, tui_border_urcorner, - tui_border_llcorner, tui_border_lrcorner); + wborder (win, tui_border_vline, tui_border_vline, + tui_border_hline, tui_border_hline, + tui_border_ulcorner, tui_border_urcorner, + tui_border_llcorner, tui_border_lrcorner); #else - box (win, tui_border_vline, tui_border_hline); + box (win, tui_border_vline, tui_border_hline); #endif - if (!win_info->title.empty ()) - mvwaddstr (win, 0, 3, win_info->title.c_str ()); - wattroff (win, attrs); - } + if (!win_info->title.empty ()) + mvwaddstr (win, 0, 3, win_info->title.c_str ()); + wattroff (win, attrs); } |