aboutsummaryrefslogtreecommitdiff
path: root/gdb/mi
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2023-03-20 10:48:50 -0600
committerTom Tromey <tromey@adacore.com>2023-05-23 10:09:27 -0600
commit7df1df795f7c738f33c0e40d99a95cf9876d6f59 (patch)
tree7f6fdc59d2f6d0e2e2050324bbbd04435155354c /gdb/mi
parent72654e04dab3d41417c2f422c8825d2b659a66fe (diff)
downloadgdb-7df1df795f7c738f33c0e40d99a95cf9876d6f59.zip
gdb-7df1df795f7c738f33c0e40d99a95cf9876d6f59.tar.gz
gdb-7df1df795f7c738f33c0e40d99a95cf9876d6f59.tar.bz2
Change mi_parse_argv to a method
This changes mi_parse_argv to be a method of mi_parse. This is just a minor cleanup.
Diffstat (limited to 'gdb/mi')
-rw-r--r--gdb/mi/mi-cmds.c2
-rw-r--r--gdb/mi/mi-parse.c8
-rw-r--r--gdb/mi/mi-parse.h7
3 files changed, 8 insertions, 9 deletions
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index ca8c633..f8cae41 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -49,7 +49,7 @@ struct mi_command_mi : public mi_command
with arguments contained within PARSE. */
void invoke (struct mi_parse *parse) const override
{
- mi_parse_argv (parse->args (), parse);
+ parse->parse_argv ();
if (parse->argv == nullptr)
error (_("Problem parsing arguments: %s %s"), parse->command,
diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c
index bf3b534..f077eb3 100644
--- a/gdb/mi/mi-parse.c
+++ b/gdb/mi/mi-parse.c
@@ -107,9 +107,9 @@ mi_parse_escape (const char **string_ptr)
}
void
-mi_parse_argv (const char *args, struct mi_parse *parse)
+mi_parse::parse_argv ()
{
- const char *chp = args;
+ const char *chp = m_args.get ();
int argc = 0;
char **argv = XNEWVEC (char *, argc + 1);
@@ -124,8 +124,8 @@ mi_parse_argv (const char *args, struct mi_parse *parse)
switch (*chp)
{
case '\0':
- parse->argv = argv;
- parse->argc = argc;
+ this->argv = argv;
+ this->argc = argc;
return;
case '"':
{
diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h
index d4ac3f0..edb6154 100644
--- a/gdb/mi/mi-parse.h
+++ b/gdb/mi/mi-parse.h
@@ -46,6 +46,9 @@ struct mi_parse
DISABLE_COPY_AND_ASSIGN (mi_parse);
+ /* Split the arguments into argc/argv and store the result. */
+ void parse_argv ();
+
/* Return the full argument string, as used by commands which are
implemented as CLI commands. */
const char *args () const
@@ -90,8 +93,4 @@ extern std::unique_ptr<struct mi_parse> mi_parse (const char *cmd,
enum print_values mi_parse_print_values (const char *name);
-/* Split ARGS into argc/argv and store the result in PARSE. */
-
-extern void mi_parse_argv (const char *args, struct mi_parse *parse);
-
#endif /* MI_MI_PARSE_H */