From patchwork Tue Sep 10 19:08:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 34473 Received: (qmail 25287 invoked by alias); 10 Sep 2019 19:09:06 -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 25221 invoked by uid 89); 10 Sep 2019 19:09:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.7 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: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.113) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 10 Sep 2019 19:09:04 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 9DAD91BC22A for ; Tue, 10 Sep 2019 14:09:00 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 7lVciocfR2qH77lVciinvH; Tue, 10 Sep 2019 14:09:00 -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=fLZ42bqNP98xeD1hZAZcaEgJoVXFmhnjo9eN1lRwGwQ=; b=Ainh/5vzHKXFUikicPOxcRkbAT 5cDZ8wxX+JS5BY0shjdOzyBrCoxlXI0my1QyLyzFs/bzp6NwDFk5AR2R2O+Nn6FZEuZfPToCyvW8k vVkqCZZBogXcP/2iwuAkB/cgp; Received: from 71-218-73-27.hlrn.qwest.net ([71.218.73.27]:51786 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1i7lVc-000EYF-1O; Tue, 10 Sep 2019 14:09:00 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 02/20] Change tui_source_element::line to be a unique_xmalloc_ptr Date: Tue, 10 Sep 2019 13:08:39 -0600 Message-Id: <20190910190857.6562-3-tom@tromey.com> In-Reply-To: <20190910190857.6562-1-tom@tromey.com> References: <20190910190857.6562-1-tom@tromey.com> This changes tui_source_element::line to be a unique_xmalloc_ptr, removing some manual memory management. gdb/ChangeLog 2019-09-10 Tom Tromey * tui/tui-winsource.h (~tui_source_element): Remove. (tui_source_element): Update. (struct tui_source_element) : Now a unique_xmalloc_ptr. * tui/tui-winsource.c (tui_show_source_line): Update. * tui/tui-source.c (tui_source_window::set_contents): Update. * tui/tui-disasm.c (tui_disasm_window::set_contents): Update. --- gdb/ChangeLog | 9 +++++++++ gdb/tui/tui-disasm.c | 5 ++--- gdb/tui/tui-source.c | 4 +--- gdb/tui/tui-winsource.c | 3 +-- gdb/tui/tui-winsource.h | 10 ++-------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 1d019ca60c1..2a331327e77 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -231,11 +231,10 @@ tui_disasm_window::set_contents (struct gdbarch *arch, strcpy (line + insn_pos, asm_lines[i].insn); /* Now copy the line taking the offset into account. */ - xfree (src->line); if (strlen (line) > offset) - src->line = xstrndup (&line[offset], line_width); + src->line.reset (xstrndup (&line[offset], line_width)); else - src->line = xstrdup (""); + src->line.reset (xstrdup ("")); src->line_or_addr.loa = LOA_ADDRESS; src->line_or_addr.u.addr = asm_lines[i].addr; diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index 906006a4225..c379173018d 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -184,9 +184,7 @@ tui_source_window::set_contents (struct gdbarch *arch, symtab_to_fullname (s)) == 0 && cur_line_no == locator->line_no); - xfree (content[cur_line].line); - content[cur_line].line - = xstrdup (text.c_str ()); + content[cur_line].line.reset (xstrdup (text.c_str ())); cur_line++; cur_line_no++; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 4520a1ac3fe..d5281193c0e 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -222,8 +222,7 @@ tui_show_source_line (struct tui_source_window_base *win_info, int lineno) tui_set_reverse_mode (win_info->handle, true); wmove (win_info->handle, lineno, TUI_EXECINFO_SIZE); - tui_puts (line->line, - win_info->handle); + tui_puts (line->line.get (), win_info->handle); if (line->is_exec_point) tui_set_reverse_mode (win_info->handle, false); diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 445cc7c7357..64f0739e536 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -54,23 +54,17 @@ struct tui_source_element line_or_addr.u.line_no = 0; } - ~tui_source_element () - { - xfree (line); - } - DISABLE_COPY_AND_ASSIGN (tui_source_element); tui_source_element (tui_source_element &&other) - : line (other.line), + : line (std::move (other.line)), line_or_addr (other.line_or_addr), is_exec_point (other.is_exec_point), break_mode (other.break_mode) { - other.line = nullptr; } - char *line = nullptr; + gdb::unique_xmalloc_ptr line; struct tui_line_or_address line_or_addr; bool is_exec_point = false; tui_bp_flags break_mode = 0;