From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id 7746E3858D39 for ; Mon, 19 Jun 2023 17:51:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7746E3858D39 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 cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id D499F1003862C for ; Mon, 19 Jun 2023 17:51:25 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id BJ2Dq407MH78gBJ2DqIzLS; Mon, 19 Jun 2023 17:51:25 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=b753XvKx c=1 sm=1 tr=0 ts=6490959d a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=of4jigFt-DYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=B_VjZOBolHVn3YbBG_EA: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=Wknh8FmgaEcZkJOY2XpL4gFHAwln4AUuDELgTUmJVw0=; b=A50D9CeTRCtFeJz8ElEtoXVmVR hRT/cbSSO4G3gqekgXVfH+R52i+uyVw1r+XSyHcKmBxOIgzLGDRi4xQZXzAyxRcy43INr+FwMrqy/ CxLnTeNp1PaNKTXUr19Pr63tW; Received: from 75-166-136-83.hlrn.qwest.net ([75.166.136.83]:49210 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qBJ2D-0019zn-N5 for gdb-patches@sourceware.org; Mon, 19 Jun 2023 11:51:25 -0600 From: Tom Tromey Date: Mon, 19 Jun 2023 11:51:24 -0600 Subject: [PATCH 3/3] Use std::string in do_set_command MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230619-remove-some-realloc-v1-3-8bee74d5b934@tromey.com> References: <20230619-remove-some-realloc-v1-0-8bee74d5b934@tromey.com> In-Reply-To: <20230619-remove-some-realloc-v1-0-8bee74d5b934@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 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.136.83 X-Source-L: No X-Exim-ID: 1qBJ2D-0019zn-N5 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-136-83.hlrn.qwest.net ([192.168.0.21]) [75.166.136.83]:49210 X-Source-Auth: tom+tromey.com X-Email-Count: 18 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.5 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 List-Id: do_set_command manually updates a string, only to copy it to a std::string and free the working copy. This patch changes this code to use std::string for everything, simplifying the code and removing a copy. --- gdb/cli/cli-setshow.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index ecb739b94e9..c7bbac1666d 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -340,14 +340,12 @@ do_set_command (const char *arg, int from_tty, struct cmd_list_element *c) { case var_string: { - char *newobj; + std::string newobj; const char *p; - char *q; int ch; - newobj = (char *) xmalloc (strlen (arg) + 2); + newobj.reserve (strlen (arg)); p = arg; - q = newobj; while ((ch = *p++) != '\000') { if (ch == '\\') @@ -365,20 +363,14 @@ do_set_command (const char *arg, int from_tty, struct cmd_list_element *c) if (ch == 0) break; /* C loses */ else if (ch > 0) - *q++ = ch; + newobj.push_back (ch); } else - *q++ = ch; + newobj.push_back (ch); } -#if 0 - if (*(p - 1) != '\\') - *q++ = ' '; -#endif - *q++ = '\0'; - newobj = (char *) xrealloc (newobj, q - newobj); - - option_changed = c->var->set (std::string (newobj)); - xfree (newobj); + newobj.shrink_to_fit (); + + option_changed = c->var->set (std::move (newobj)); } break; case var_string_noescape: -- 2.39.2