From patchwork Tue Feb 14 19:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 65004 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 409D2385B514 for ; Tue, 14 Feb 2023 19:23:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 409D2385B514 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676402635; bh=kSckr+7DJDkDJ2AByYax2LaMKEaIzpLKsxVwLTX+vwM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=Mu1hjPq5X09Mhfu1WIWUf4aFVrt7VxglhvTvpqU7J6FTTm1Xq/9Hf2XkDAtXisFod 8E/KZ0omSti9jHIkYlltHH9I5Hw+bC5sZoQayU6tI0HXhAO2m8a591PSNcWPNXdaIA KMTgJqu39FHwLiFgdKPKY8fJNRS1qGPCEzCdSzNo= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 9FCD33858D1E for ; Tue, 14 Feb 2023 19:23:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9FCD33858D1E Received: from smarchi-efficios.internal.efficios.com (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) (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 ESMTPSA id 31E131E110; Tue, 14 Feb 2023 14:23:28 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2 1/3] gdb: use std::string for internalvar::name Date: Tue, 14 Feb 2023 14:23:25 -0500 Message-Id: <20230214192327.318301-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3497.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, 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: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Change internalvar::name to std::string, automating memory management. It becomes necessary to allocate internalvar with new instead of XNEW. I didn't find how to trigger the code in complete_internalvar. It is called from condition_completer, so it should be by using the "condition" command, but I never managed to get in the right code path. Change-Id: I814d61361663e7becb8f3fb5f58c0180cdc414bc --- gdb/value.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index 7873aeb9558e..936949f4a1f1 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1830,7 +1830,7 @@ union internalvar_data struct internalvar { struct internalvar *next; - char *name; + std::string name; /* We support various different kinds of content of an internal variable. enum internalvar_kind specifies the kind, and union internalvar_data @@ -1894,7 +1894,7 @@ lookup_only_internalvar (const char *name) struct internalvar *var; for (var = internalvars; var; var = var->next) - if (strcmp (var->name, name) == 0) + if (var->name == name) return var; return NULL; @@ -1912,8 +1912,8 @@ complete_internalvar (completion_tracker &tracker, const char *name) len = strlen (name); for (var = internalvars; var; var = var->next) - if (strncmp (var->name, name, len) == 0) - tracker.add_completion (make_unique_xstrdup (var->name)); + if (var->name.compare (0, len, name) == 0) + tracker.add_completion (make_unique_xstrdup (var->name.c_str ())); } /* Create an internal variable with name NAME and with a void value. @@ -1922,9 +1922,9 @@ complete_internalvar (completion_tracker &tracker, const char *name) struct internalvar * create_internalvar (const char *name) { - struct internalvar *var = XNEW (struct internalvar); + internalvar *var = new internalvar; - var->name = xstrdup (name); + var->name = name; var->kind = INTERNALVAR_VOID; var->next = internalvars; internalvars = var; @@ -1996,7 +1996,7 @@ value_of_internalvar (struct gdbarch *gdbarch, struct internalvar *var) /* If there is a trace state variable of the same name, assume that is what we really want to see. */ - tsv = find_trace_state_variable (var->name); + tsv = find_trace_state_variable (var->name.c_str ()); if (tsv) { tsv->value_known = target_get_trace_state_variable_value (tsv->number, @@ -2149,7 +2149,7 @@ set_internalvar (struct internalvar *var, struct value *val) union internalvar_data new_data = { 0 }; if (var->kind == INTERNALVAR_FUNCTION && var->u.fn.canonical) - error (_("Cannot overwrite convenience function %s"), var->name); + error (_("Cannot overwrite convenience function %s"), var->name.c_str ()); /* Prepare new contents. */ switch (check_typedef (val->type ())->code ()) @@ -2261,7 +2261,7 @@ clear_internalvar (struct internalvar *var) const char * internalvar_name (const struct internalvar *var) { - return var->name; + return var->name.c_str (); } static struct internal_function * @@ -2450,7 +2450,7 @@ show_convenience (const char *ignore, int from_tty) { varseen = 1; } - gdb_printf (("$%s = "), var->name); + gdb_printf (("$%s = "), var->name.c_str ()); try {