From patchwork Sun Jul 9 17:01:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 72392 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F524385AF8D for ; Sun, 9 Jul 2023 17:02:08 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-820.bluehost.com (outbound-ss-820.bluehost.com [69.89.24.241]) by sourceware.org (Postfix) with ESMTPS id 8D7153858C30 for ; Sun, 9 Jul 2023 17:01:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8D7153858C30 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id 2D4B310047FB3 for ; Sun, 9 Jul 2023 17:01:49 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id IXnBqAmUONX2aIXnBqcVfv; Sun, 09 Jul 2023 17:01:49 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=64aae7fd a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=ws7JD89P4LkA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=cTMaWx_JMQxhfjUJ5IIA:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=0WYhLlr0XQWmJuvWQRUd5y6g5C/cYGcnrzXNCArjSak=; b=s4mkuCEhC26JdjPEkSZH7z+WUX vHk/W5dXCC2uCR6Imniz69YholUre2D6f42So3lakGxjNut/3DkTsX4gsvGOTSB016uzgrAYnwFxz TlGLj9EZPHKJd4320kC3ePecg; Received: from 75-166-135-140.hlrn.qwest.net ([75.166.135.140]:52250 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qIXnA-001oeb-31 for gdb-patches@sourceware.org; Sun, 09 Jul 2023 11:01:48 -0600 From: Tom Tromey Date: Sun, 09 Jul 2023 11:01:49 -0600 Subject: [PATCH 3/8] Use unique_ptr for trace_filename MIME-Version: 1.0 Message-Id: <20230709-trace-cleanups-v1-3-c410e1072fab@tromey.com> References: <20230709-trace-cleanups-v1-0-c410e1072fab@tromey.com> In-Reply-To: <20230709-trace-cleanups-v1-0-c410e1072fab@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.3 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.135.140 X-Source-L: No X-Exim-ID: 1qIXnA-001oeb-31 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-135-140.hlrn.qwest.net ([192.168.0.21]) [75.166.135.140]:52250 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This changes trace_filename to use unique_ptr, removing some manual memory management. --- gdb/tracefile-tfile.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c index ff451c79e88..364f8c1f08e 100644 --- a/gdb/tracefile-tfile.c +++ b/gdb/tracefile-tfile.c @@ -415,7 +415,7 @@ static tfile_target tfile_ops; #define TFILE_PID (1) -static char *trace_filename; +static gdb::unique_xmalloc_ptr trace_filename; static int trace_fd = -1; static off_t trace_frames_offset; static off_t cur_offset; @@ -441,7 +441,7 @@ tfile_read (gdb_byte *readbuf, int size) gotten = read (trace_fd, readbuf, size); if (gotten < 0) - perror_with_name (trace_filename); + perror_with_name (trace_filename.get ()); else if (gotten < size) error (_("Premature end of file while reading trace file")); } @@ -479,7 +479,7 @@ tfile_target_open (const char *arg, int from_tty) current_inferior ()->unpush_target (&tfile_ops); - trace_filename = filename.release (); + trace_filename = std::move (filename); trace_fd = scratch_chan; /* Make sure this is clear. */ @@ -499,7 +499,7 @@ tfile_target_open (const char *arg, int from_tty) trace_regblock_size = 0; ts = current_trace_status (); /* We know we're working with a file. Record its name. */ - ts->filename = trace_filename; + ts->filename = trace_filename.get (); /* Set defaults in case there is no status line. */ ts->running_known = 0; ts->stop_reason = trace_stop_reason_unknown; @@ -620,8 +620,7 @@ tfile_target::close () ::close (trace_fd); trace_fd = -1; - xfree (trace_filename); - trace_filename = NULL; + trace_filename.reset (); trace_tdesc.clear (); trace_reset_local_state (); @@ -630,7 +629,7 @@ tfile_target::close () void tfile_target::files_info () { - gdb_printf ("\t`%s'\n", trace_filename); + gdb_printf ("\t`%s'\n", trace_filename.get ()); } void