From patchwork Sun Jun 23 22:42:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33281 Received: (qmail 47395 invoked by alias); 23 Jun 2019 22:43:41 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 47337 invoked by uid 89); 23 Jun 2019 22:43:41 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.49.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jun 2019 22:43:39 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 4777889D0 for ; Sun, 23 Jun 2019 17:43:38 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fBD0hIMYt2PzOfBD0hXxtL; Sun, 23 Jun 2019 17:43:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=f/dbLFUts2RqDyyuahJxnuHzJbyi4eMEkDpSXEa8N10=; b=RRjMZmfoAFyNCyNh2C/bBqdE1D MneBPjgujq+5dWT9/wJYri0ueth97+ZSOWB04Q0GouTxzwJ1lTK1dun0tJ14Er+tzlTJGwT9JiG6e J9I5Gb2TVhUuNMXG3xbIS1iwE; Received: from 75-166-12-78.hlrn.qwest.net ([75.166.12.78]:54396 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1hfBD0-000vDQ-2W; Sun, 23 Jun 2019 17:43:38 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 02/66] Add destructor to tui_win_info Date: Sun, 23 Jun 2019 16:42:25 -0600 Message-Id: <20190623224329.16060-3-tom@tromey.com> In-Reply-To: <20190623224329.16060-1-tom@tromey.com> References: <20190623224329.16060-1-tom@tromey.com> This changes tui_free_window into a destructor for tui_free_window and then updates the users. gdb/ChangeLog 2019-06-23 Tom Tromey * tui/tui-win.c (tui_resize_all): Use delete. * tui/tui-data.h (struct tui_win_info) <~tui_win_info>: Declare destructor. (tui_free_window): Don't declare. * tui/tui-data.c (~tui_win_info): Rename from tui_free_window. Update. --- gdb/ChangeLog | 9 ++++++++ gdb/tui/tui-data.c | 52 ++++++++++++++++++++++------------------------ gdb/tui/tui-data.h | 3 ++- gdb/tui/tui-win.c | 2 +- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index 117bda3c200..1c96fc1c077 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -603,21 +603,20 @@ tui_add_content_elements (struct tui_gen_win_info *win_info, return index_start; } -void -tui_free_window (struct tui_win_info *win_info) +tui_win_info::~tui_win_info () { struct tui_gen_win_info *generic_win; - switch (win_info->generic.type) + switch (generic.type) { case SRC_WIN: case DISASSEM_WIN: - if (win_info->detail.source_info.fullname) + if (detail.source_info.fullname) { - xfree (win_info->detail.source_info.fullname); - win_info->detail.source_info.fullname = NULL; + xfree (detail.source_info.fullname); + detail.source_info.fullname = NULL; } - generic_win = win_info->detail.source_info.execution_info; + generic_win = detail.source_info.execution_info; if (generic_win != NULL) { tui_delete_win (generic_win->handle); @@ -626,34 +625,33 @@ tui_free_window (struct tui_win_info *win_info) } break; case DATA_WIN: - if (win_info->generic.content != NULL) + if (generic.content != NULL) { - tui_free_data_content (win_info->detail.data_display_info.regs_content, - win_info->detail.data_display_info.regs_content_count); - win_info->detail.data_display_info.regs_content = NULL; - win_info->detail.data_display_info.regs_content_count = 0; - tui_free_data_content (win_info->detail.data_display_info.data_content, - win_info->detail.data_display_info.data_content_count); - win_info->detail.data_display_info.data_content = NULL; - win_info->detail.data_display_info.data_content_count = 0; - win_info->detail.data_display_info.regs_column_count = 1; - win_info->detail.data_display_info.display_regs = FALSE; - win_info->generic.content = NULL; - win_info->generic.content_size = 0; + tui_free_data_content (detail.data_display_info.regs_content, + detail.data_display_info.regs_content_count); + detail.data_display_info.regs_content = NULL; + detail.data_display_info.regs_content_count = 0; + tui_free_data_content (detail.data_display_info.data_content, + detail.data_display_info.data_content_count); + detail.data_display_info.data_content = NULL; + detail.data_display_info.data_content_count = 0; + detail.data_display_info.regs_column_count = 1; + detail.data_display_info.display_regs = FALSE; + generic.content = NULL; + generic.content_size = 0; } break; default: break; } - if (win_info->generic.handle != NULL) + if (generic.handle != NULL) { - tui_delete_win (win_info->generic.handle); - win_info->generic.handle = NULL; - tui_free_win_content (&win_info->generic); + tui_delete_win (generic.handle); + generic.handle = NULL; + tui_free_win_content (&generic); } - if (win_info->generic.title) - xfree (win_info->generic.title); - delete win_info; + if (generic.title) + xfree (generic.title); } diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 34822e2a92d..ef20c02df2b 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -276,6 +276,8 @@ struct tui_win_info generic.type = type; } + ~tui_win_info (); + DISABLE_COPY_AND_ASSIGN (tui_win_info); struct tui_gen_win_info generic; /* General window information. */ @@ -313,7 +315,6 @@ extern void tui_init_generic_part (struct tui_gen_win_info *); extern tui_win_content tui_alloc_content (int, enum tui_win_type); extern int tui_add_content_elements (struct tui_gen_win_info *, int); -extern void tui_free_window (struct tui_win_info *); extern void tui_free_win_content (struct tui_gen_win_info *); extern void tui_free_data_content (tui_win_content, int); extern void tui_free_all_source_wins_content (void); diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index a1329e54a81..a69e0878eff 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -785,7 +785,7 @@ tui_resize_all (void) && (tui_win_list[win_type] != NULL) && !tui_win_list[win_type]->generic.is_visible) { - tui_free_window (tui_win_list[win_type]); + delete tui_win_list[win_type]; tui_win_list[win_type] = NULL; } }