From patchwork Fri Dec 16 23:50:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 62033 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 28EAE382FAF5 for ; Fri, 16 Dec 2022 23:51:21 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 7DD9138369DE for ; Fri, 16 Dec 2022 23:50:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7DD9138369DE 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 cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 74C3C10048ECC for ; Fri, 16 Dec 2022 23:50:31 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6KTHp948qR8oI6KTHpfMW7; Fri, 16 Dec 2022 23:50:31 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=DseTREz+ c=1 sm=1 tr=0 ts=639d0447 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=sHyYjHe8cH0A:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=fOZgNBgWbKeGMVsnxmUA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=fiLBGErizK7ZPNWrGm8ZLhF22TzkNbUB8MKgiFrMlNY=; b=Ym+l/mYMG/4N41pYMjzNo9u8xn 3zQXmUqGRS4JV23WISDZ80snFLxVtpZd2Osekya+f5Q6HkUy6Lo+xwN1vRAieEClAu+6ir1A7Dbi9 ZnMU8qiKnC/wdCgXuU8CT5N+3; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:49920 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1p6KTH-002Lmq-5n; Fri, 16 Dec 2022 16:50:31 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/7] Remove struct buffer from tracefile-tfile.c Date: Fri, 16 Dec 2022 16:50:11 -0700 Message-Id: <20221216235017.3722833-2-tom@tromey.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221216235017.3722833-1-tom@tromey.com> References: <20221216235017.3722833-1-tom@tromey.com> MIME-Version: 1.0 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: 97.122.76.186 X-Source-L: No X-Exim-ID: 1p6KTH-002Lmq-5n X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:49920 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.3 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 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 tracefile-tfile.c to use std::string rather than struct buffer. --- gdb/tracefile-tfile.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c index 3266f357a27..831c510648c 100644 --- a/gdb/tracefile-tfile.c +++ b/gdb/tracefile-tfile.c @@ -31,7 +31,6 @@ #include "remote.h" #include "xml-tdesc.h" #include "target-descriptions.h" -#include "gdbsupport/buffer.h" #include "gdbsupport/pathstuff.h" #include @@ -425,7 +424,7 @@ static off_t trace_frames_offset; static off_t cur_offset; static int cur_data_size; int trace_regblock_size; -static struct buffer trace_tdesc; +static std::string trace_tdesc; static void tfile_append_tdesc_line (const char *line); static void tfile_interp_line (char *line, @@ -487,7 +486,7 @@ tfile_target_open (const char *arg, int from_tty) trace_fd = scratch_chan; /* Make sure this is clear. */ - buffer_free (&trace_tdesc); + trace_tdesc.clear (); bytes = 0; /* Read the file header and test for validity. */ @@ -626,7 +625,7 @@ tfile_target::close () trace_fd = -1; xfree (trace_filename); trace_filename = NULL; - buffer_free (&trace_tdesc); + trace_tdesc.clear (); trace_reset_local_state (); } @@ -922,16 +921,16 @@ tfile_xfer_partial_features (const char *annex, if (readbuf == NULL) error (_("tfile_xfer_partial: tdesc is read-only")); - if (trace_tdesc.used_size == 0) + if (trace_tdesc.empty ()) return TARGET_XFER_E_IO; - if (offset >= trace_tdesc.used_size) + if (offset >= trace_tdesc.length ()) return TARGET_XFER_EOF; - if (len > trace_tdesc.used_size - offset) - len = trace_tdesc.used_size - offset; + if (len > trace_tdesc.length () - offset) + len = trace_tdesc.length () - offset; - memcpy (readbuf, trace_tdesc.buffer + offset, len); + memcpy (readbuf, trace_tdesc.c_str () + offset, len); *xfered_len = len; return TARGET_XFER_OK; @@ -1128,8 +1127,8 @@ tfile_target::traceframe_info () static void tfile_append_tdesc_line (const char *line) { - buffer_grow_str (&trace_tdesc, line); - buffer_grow_str (&trace_tdesc, "\n"); + trace_tdesc += line; + trace_tdesc += "\n"; } void _initialize_tracefile_tfile ();