From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 791113858D20 for ; Tue, 14 Feb 2023 04:21:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 791113858D20 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com Received: from localhost.localdomain (unknown [217.28.27.60]) (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 2F2B81E128; Mon, 13 Feb 2023 23:21:41 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 2/3] gdb: use std::string for internalvar::name Date: Mon, 13 Feb 2023 23:21:38 -0500 Message-Id: <20230214042139.73638-2-simon.marchi@efficios.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214042139.73638-1-simon.marchi@efficios.com> References: <20230214042139.73638-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1173.9 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 List-Id: Change internalvar::name to std::string, automating memory management. Change-Id: I814d61361663e7becb8f3fb5f58c0180cdc414bc --- gdb/value.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index e884913abe5a..68499896af8c 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1829,7 +1829,7 @@ union internalvar_data struct internalvar { - 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 @@ -1893,7 +1893,7 @@ struct internalvar * lookup_only_internalvar (const char *name) { for (internalvar_up &var : internalvars) - if (strcmp (var->name, name) == 0) + if (var->name == name) return var.get (); return NULL; @@ -1910,8 +1910,8 @@ complete_internalvar (completion_tracker &tracker, const char *name) len = strlen (name); for (internalvar_up &var : internalvars) - if (strncmp (var->name, name, len) == 0) - tracker.add_completion (make_unique_xstrdup (var->name)); + if (strncmp (var->name.c_str (), name, len) == 0) + tracker.add_completion (make_unique_xstrdup (var->name.c_str ())); } /* Create an internal variable with name NAME and with a void value. @@ -1923,7 +1923,7 @@ create_internalvar (const char *name) internalvars.emplace_back (new internalvar); internalvar *var = internalvars.back ().get (); - var->name = xstrdup (name); + var->name = name; var->kind = INTERNALVAR_VOID; return var; @@ -1994,7 +1994,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, @@ -2147,7 +2147,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 ()) @@ -2259,7 +2259,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 * @@ -2444,7 +2444,7 @@ show_convenience (const char *ignore, int from_tty) { varseen = 1; } - gdb_printf (("$%s = "), var->name); + gdb_printf (("$%s = "), var->name.c_str ()); try { -- 2.39.1