diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-23 16:38:06 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-06-25 07:48:52 -0600 |
| commit | c2fc64f54ef82ccd2fedc9078c539ad273e83a0b (patch) | |
| tree | e4c78d8a252a955eb7ee3bd6dfcc0aeebdb6e4ae | |
| parent | fb54fa768d148ccd07f2b27ae26e87d95605986c (diff) | |
| download | binutils-c2fc64f54ef82ccd2fedc9078c539ad273e83a0b.zip binutils-c2fc64f54ef82ccd2fedc9078c539ad273e83a0b.tar.gz binutils-c2fc64f54ef82ccd2fedc9078c539ad273e83a0b.tar.bz2 | |
Tidy tui_delete_win
tui_delete_win does its own NULL check, so ~tui_gen_win_info does not
need to do it. Also, tui_delete_win has an extraneous "return".
gdb/ChangeLog
2019-06-25 Tom Tromey <tom@tromey.com>
* tui/tui-wingeneral.c (tui_delete_win): Remove "return".
* tui/tui-data.c (~tui_gen_win_info): Remove "if".
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/tui/tui-data.c | 6 | ||||
| -rw-r--r-- | gdb/tui/tui-wingeneral.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 62e9053..ff05c1c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-06-25 Tom Tromey <tom@tromey.com> + * tui/tui-wingeneral.c (tui_delete_win): Remove "return". + * tui/tui-data.c (~tui_gen_win_info): Remove "if". + +2019-06-25 Tom Tromey <tom@tromey.com> + * tui/tui-layout.c (init_and_make_win): Assert on unrecognized type. * tui/tui-data.h (struct tui_gen_win_info): Make constructor diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index a018a4b..a62dbf4 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -350,11 +350,7 @@ tui_source_window_base::tui_source_window_base (enum tui_win_type type) tui_gen_win_info::~tui_gen_win_info () { - if (handle != NULL) - { - tui_delete_win (handle); - handle = NULL; - } + tui_delete_win (handle); xfree (title); } diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c index 13063ae..cf8d9fc 100644 --- a/gdb/tui/tui-wingeneral.c +++ b/gdb/tui/tui-wingeneral.c @@ -63,8 +63,6 @@ tui_delete_win (WINDOW *window) { if (window != NULL) delwin (window); - - return; } |