From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 47041 invoked by alias); 25 Jun 2019 14:03:58 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 47021 invoked by uid 306); 25 Jun 2019 14:03:57 -0000 Date: Tue, 25 Jun 2019 14:03:00 -0000 Message-ID: <20190625140357.47020.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Tidy tui_delete_win X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: fb54fa768d148ccd07f2b27ae26e87d95605986c X-Git-Newrev: c2fc64f54ef82ccd2fedc9078c539ad273e83a0b X-SW-Source: 2019-06/txt/msg00202.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c2fc64f54ef82ccd2fedc9078c539ad273e83a0b commit c2fc64f54ef82ccd2fedc9078c539ad273e83a0b Author: Tom Tromey Date: Sun Jun 23 16:38:06 2019 -0600 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 * tui/tui-wingeneral.c (tui_delete_win): Remove "return". * tui/tui-data.c (~tui_gen_win_info): Remove "if". Diff: --- gdb/ChangeLog | 5 +++++ gdb/tui/tui-data.c | 6 +----- 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 + * tui/tui-wingeneral.c (tui_delete_win): Remove "return". + * tui/tui-data.c (~tui_gen_win_info): Remove "if". + +2019-06-25 Tom Tromey + * 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; }