From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 1/3] gdb: use std::string for internalvar::name
Date: Tue, 14 Feb 2023 14:23:25 -0500 [thread overview]
Message-ID: <20230214192327.318301-1-simon.marchi@efficios.com> (raw)
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
{
--
2.39.1
next reply other threads:[~2023-02-14 19:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 19:23 Simon Marchi [this message]
2023-02-14 19:23 ` [PATCH v2 2/3] gdb: add constructor to internalvar Simon Marchi
2023-02-14 20:42 ` Tom Tromey
2023-02-15 16:38 ` Simon Marchi
2023-02-15 16:56 ` Tom Tromey
2023-02-15 16:58 ` Simon Marchi
2023-02-14 19:23 ` [PATCH v2 3/3] gdb: store internalvars in an std::map Simon Marchi
2023-02-14 20:46 ` Tom Tromey
2023-02-14 20:37 ` [PATCH v2 1/3] gdb: use std::string for internalvar::name Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230214192327.318301-1-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).