From patchwork Sun Jul 9 17:01:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 72395 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 6F322385AF8E for ; Sun, 9 Jul 2023 17:03:06 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy3-pub.mail.unifiedlayer.com (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42]) by sourceware.org (Postfix) with ESMTPS id 9E19F385842E for ; Sun, 9 Jul 2023 17:01:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E19F385842E 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 cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id 5721D100482B2 for ; Sun, 9 Jul 2023 17:01:49 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id IXnBqO72r76PwIXnBqwfDj; Sun, 09 Jul 2023 17:01:49 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=FYLyeLy6 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=f2I-0AVsDXALEDwm0cYA: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=RgUSBXXwLoreWwH3g3VgAlUtepLZ2/NhlNC17nO3FvA=; b=kp9aOrI0voxSfR/9oBszufjjfE wj1W/xku+WQFC4LtK05F8Nm0yJWqwdqMD9LxyPvtoint4FtgNjMWvufwxpwJZExMCYAxY44F707bC LwY9cVr95UDHbCb+0cOv5MPCa; 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 1qIXnB-001oeb-07 for gdb-patches@sourceware.org; Sun, 09 Jul 2023 11:01:49 -0600 From: Tom Tromey Date: Sun, 09 Jul 2023 11:01:50 -0600 Subject: [PATCH 4/8] Use unique_ptr for trace_dirname MIME-Version: 1.0 Message-Id: <20230709-trace-cleanups-v1-4-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: 1qIXnB-001oeb-07 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: 5 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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_dirname to use unique_ptr, removing some manual memory management. --- gdb/tracectf.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gdb/tracectf.c b/gdb/tracectf.c index 8f6ea250f61..fca623b3f21 100644 --- a/gdb/tracectf.c +++ b/gdb/tracectf.c @@ -862,7 +862,7 @@ static struct bt_ctf_iter *ctf_iter = NULL; static struct bt_iter_pos *start_pos; /* The name of CTF directory. */ -static char *trace_dirname; +static gdb::unique_xmalloc_ptr trace_dirname; static ctf_target ctf_ops; @@ -1164,7 +1164,7 @@ ctf_target_open (const char *dirname, int from_tty) start_pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter)); gdb_assert (start_pos->type == BT_SEEK_RESTORE); - trace_dirname = xstrdup (dirname); + trace_dirname = make_unique_xstrdup (dirname); current_inferior ()->push_target (&ctf_ops); inferior_appeared (current_inferior (), CTF_PID); @@ -1185,8 +1185,7 @@ void ctf_target::close () { ctf_destroy (); - xfree (trace_dirname); - trace_dirname = NULL; + trace_dirname.reset (); switch_to_no_thread (); /* Avoid confusion from thread stuff. */ exit_inferior_silent (current_inferior ()); @@ -1200,7 +1199,7 @@ ctf_target::close () void ctf_target::files_info () { - gdb_printf ("\t`%s'\n", trace_dirname); + gdb_printf ("\t`%s'\n", trace_dirname.get ()); } /* This is the implementation of target_ops method to_fetch_registers.