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".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62e90533cacd35da6e132410e13b18ce384186ce..ff05c1ccbe7c521efb6e9eae192b3e54bb5da961 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index a018a4bf6abf84eef5438a24cce28cf75edae081..a62dbf4d670c3679ee13f5d404ad9d2c476173a5 100644 (file)
--- 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 13063ae9356f0fde8e7fac60fe2b1e1df7172f81..cf8d9fc395937df63d317c0c38a3c94f0d4ffde4 100644 (file)
--- 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;
 }