From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id LMcyNeOMd1/hNgAAWB0awg (envelope-from ) for ; Fri, 02 Oct 2020 16:26:11 -0400 Received: by simark.ca (Postfix, from userid 112) id CD1FB1EF44; Fri, 2 Oct 2020 16:26:11 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 2AD981E590 for ; Fri, 2 Oct 2020 16:26:10 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4669E398E48F; Fri, 2 Oct 2020 20:26:09 +0000 (GMT) Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id 7A0303945C25 for ; Fri, 2 Oct 2020 20:26:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7A0303945C25 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 5A9E61178AB; Fri, 2 Oct 2020 16:26:06 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id CoRNWapu0Qli; Fri, 2 Oct 2020 16:26:06 -0400 (EDT) Received: from murgatroyd.Home (174-16-122-38.hlrn.qwest.net [174.16.122.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 18EA0117839; Fri, 2 Oct 2020 16:26:06 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 2/2] Use obstack in ada_encode_1 Date: Fri, 2 Oct 2020 14:26:04 -0600 Message-Id: <20201002202604.1517475-3-tromey@adacore.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002202604.1517475-1-tromey@adacore.com> References: <20201002202604.1517475-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Cc: Tom Tromey Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" I'd eventually like to get rid of the GROW_VECT macro; and since I had already touched ada_encode_1 I decided to start here. This patch removes the use of the macro in favor of using an obstack in this function. 2020-10-02 Tom Tromey * ada-lang.c (ada_encode_1): Use an obstack. --- gdb/ChangeLog | 4 ++++ gdb/ada-lang.c | 26 +++++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 2502d2847b2..dfe9d44959f 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -926,25 +926,17 @@ const struct ada_opname_map ada_opname_table[] = { static const char * ada_encode_1 (const char *decoded, bool throw_errors) { - static char *encoding_buffer = NULL; - static size_t encoding_buffer_size = 0; + static auto_obstack encoding_buffer; const char *p; - int k; if (decoded == NULL) return NULL; - GROW_VECT (encoding_buffer, encoding_buffer_size, - 2 * strlen (decoded) + 10); - - k = 0; + encoding_buffer.clear (); for (p = decoded; *p != '\0'; p += 1) { if (*p == '.') - { - encoding_buffer[k] = encoding_buffer[k + 1] = '_'; - k += 2; - } + obstack_grow_str (&encoding_buffer, "__"); else if (*p == '"') { const struct ada_opname_map *mapping; @@ -960,19 +952,15 @@ ada_encode_1 (const char *decoded, bool throw_errors) else return NULL; } - strcpy (encoding_buffer + k, mapping->encoded); - k += strlen (mapping->encoded); + obstack_grow_str (&encoding_buffer, mapping->encoded); break; } else - { - encoding_buffer[k] = *p; - k += 1; - } + obstack_1grow (&encoding_buffer, *p); } - encoding_buffer[k] = '\0'; - return encoding_buffer; + obstack_1grow (&encoding_buffer, '\0'); + return (const char *) obstack_finish (&encoding_buffer); } /* The "encoded" form of DECODED, according to GNAT conventions. -- 2.26.2