Turn set_inferior_args_vector into method of inferior
Commit Message
This patch turns set_inferior_args_vector into an overload of
inferior::set_args.
Regression tested on x86-64 Fedora 36.
---
gdb/infcmd.c | 8 --------
gdb/inferior.c | 8 ++++++++
gdb/inferior.h | 5 +++--
gdb/main.c | 3 ++-
4 files changed, 13 insertions(+), 11 deletions(-)
Comments
>>>>> "Tom" == Tom Tromey via Gdb-patches <gdb-patches@sourceware.org> writes:
Tom> This patch turns set_inferior_args_vector into an overload of
Tom> inferior::set_args.
Tom> Regression tested on x86-64 Fedora 36.
I'm going to check this in now.
Tom
@@ -128,14 +128,6 @@ show_inferior_tty_command (struct ui_file *file, int from_tty,
"is \"%s\".\n"), inferior_tty.c_str ());
}
-void
-set_inferior_args_vector (int argc, char **argv)
-{
- gdb::array_view<char * const> args (argv, argc);
- std::string n = construct_inferior_arguments (args);
- current_inferior ()->set_args (std::move (n));
-}
-
/* Notice when `set args' is run. */
static void
@@ -164,6 +164,14 @@ inferior::tty ()
return m_terminal;
}
+/* See inferior.h. */
+
+void
+inferior::set_args (gdb::array_view<char * const> args)
+{
+ set_args (construct_inferior_arguments (args));
+}
+
void
inferior::add_continuation (std::function<void ()> &&cont)
{
@@ -225,8 +225,6 @@ extern void post_create_inferior (int from_tty);
extern void attach_command (const char *, int);
-extern void set_inferior_args_vector (int, char **);
-
extern void registers_info (const char *, int);
extern void continue_1 (int all_threads);
@@ -523,6 +521,9 @@ class inferior : public refcounted_object,
m_args = std::move (args);
};
+ /* Set the argument string from some strings. */
+ void set_args (gdb::array_view<char * const> args);
+
/* Get the argument string to use when running this inferior.
No arguments is represented by an empty string. */
@@ -1064,7 +1064,8 @@ captured_main_1 (struct captured_main_args *context)
symarg = argv[optind];
execarg = argv[optind];
++optind;
- set_inferior_args_vector (argc - optind, &argv[optind]);
+ current_inferior ()->set_args
+ (gdb::array_view<char * const> (&argv[optind], argc - optind));
}
else
{