From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 9BBCD3858408; Mon, 1 May 2023 17:14:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9BBCD3858408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682961278; bh=B/3O+CTrPHBUlNfYfUDH40z5VqEWCArmpuddsWpFXYM=; h=From:To:Subject:Date:From; b=m2m/WlEdvU/MlrAnBlMkLvgEv0VEt/KpunNDLhjeqq5vV6MZUrMMCT9qKfWoxzqo5 VXsLsfpGsPgjgvBUDCsnfZn4MItL6NWANr14q/V4LhMEJo5gYkAVSyQq+sUnpwupQg v71gSP5+SflUUwP6UKc1YNsIKIHourXM7prN0mXs= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Turn set_inferior_args_vector into method of inferior X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: ba71385e7f8824849f5a1f3d77bd5f03928138eb X-Git-Newrev: 7d3b43a15bd4267b5782ca40c0bb1dec1fa3f476 Message-Id: <20230501171438.9BBCD3858408@sourceware.org> Date: Mon, 1 May 2023 17:14:38 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7d3b43a15bd4= 267b5782ca40c0bb1dec1fa3f476 commit 7d3b43a15bd4267b5782ca40c0bb1dec1fa3f476 Author: Tom Tromey Date: Fri Apr 14 13:18:05 2023 -0600 Turn set_inferior_args_vector into method of inferior =20 This patch turns set_inferior_args_vector into an overload of inferior::set_args. =20 Regression tested on x86-64 Fedora 36. Diff: --- gdb/infcmd.c | 8 -------- gdb/inferior.c | 8 ++++++++ gdb/inferior.h | 5 +++-- gdb/main.c | 3 ++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 1ed7ced275a..dd3675e37c5 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -120,14 +120,6 @@ show_inferior_tty_command (struct ui_file *file, int f= rom_tty, "is \"%s\".\n"), inferior_tty.c_str ()); } =20 -void -set_inferior_args_vector (int argc, char **argv) -{ - gdb::array_view args (argv, argc); - std::string n =3D construct_inferior_arguments (args); - current_inferior ()->set_args (std::move (n)); -} - /* Store the new value passed to 'set args'. */ =20 static void diff --git a/gdb/inferior.c b/gdb/inferior.c index 9e37029d544..fd451c87e70 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -164,6 +164,14 @@ inferior::tty () return m_terminal; } =20 +/* See inferior.h. */ + +void +inferior::set_args (gdb::array_view args) +{ + set_args (construct_inferior_arguments (args)); +} + void inferior::add_continuation (std::function &&cont) { diff --git a/gdb/inferior.h b/gdb/inferior.h index 613ef28d660..caa8e4d494a 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -225,8 +225,6 @@ extern void post_create_inferior (int from_tty); =20 extern void attach_command (const char *, int); =20 -extern void set_inferior_args_vector (int, char **); - extern void registers_info (const char *, int); =20 extern void continue_1 (int all_threads); @@ -530,6 +528,9 @@ public: m_args =3D std::move (args); }; =20 + /* Set the argument string from some strings. */ + void set_args (gdb::array_view args); + /* Get the argument string to use when running this inferior. =20 No arguments is represented by an empty string. */ diff --git a/gdb/main.c b/gdb/main.c index 0bf6f98a797..9fb6dceb9ca 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1064,7 +1064,8 @@ captured_main_1 (struct captured_main_args *context) symarg =3D argv[optind]; execarg =3D argv[optind]; ++optind; - set_inferior_args_vector (argc - optind, &argv[optind]); + current_inferior ()->set_args + (gdb::array_view (&argv[optind], argc - optind)); } else {