From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) by sourceware.org (Postfix) with ESMTPS id 27FAC3858C62 for ; Thu, 18 May 2023 20:18:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 27FAC3858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-3360a95c0a1so6740395ab.0 for ; Thu, 18 May 2023 13:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1684441091; x=1687033091; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=FkyCYudp/tJQ3iNztH4uhYIHCDquZ/O3dTE+BPQ00kE=; b=P4uGZ9iOIBMDMfwqqgVcoAfKiEJzYfxHH5dEas2dl5CR+Sq3L5hT8kK2kzdby1ajAu WDq6pRHvZGQbztwlSswkayU6xDypN2szwO8b4132cXMEZqRFB7PtXV9mmklyZkssRt74 CY7HaEIrruHAHi+O8/5F0Bz6z8bJfQw2xkAplAQ0HgFmmmrpQhVpbIcGaEGFLYJgtDyi S4v1kfgBH4U9NeTp3j0+XpA57TQ5MulJqXNG0QR83xvnGAuOZ6UQYzqBMYyMCcYUF4Df vp5sSGnAeVUY1NiOrpqvLrZNaZFBPPzrvHHTYNrnv2kYEvZyRO3OGWwoLcEgBTKE6kmB 0Scw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684441091; x=1687033091; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FkyCYudp/tJQ3iNztH4uhYIHCDquZ/O3dTE+BPQ00kE=; b=f63KntFWQphhhW/2BoPnVEIfrNq+sPxDv97mN7VJAOzqwuNm7ADBil8SU2epbr01AD qu0daNvjM4ChNAwQ0elhpPmo5CeDoHx/1AhlTeaZ9N/QfE0rq92fljPh+Li1is2yswle FwyF8vmm2kpHwJvA5w187vLx1/NoIPgIC48S7kXcrM52CeNa3GPyGYTG47C1LQKLvGLW SOvR8lzgHH0UxRuXGeainsLbgO2U+g/EXho0FVcwMDIYmcmhfInVsDb3B1eyVw21krlW W94JnfqE7vUX9rnOqCDhLdFgBZ+/hxQceQc0VIRMHn8J9mqYS72V1xpHUUrDDFZLdyXV +BDA== X-Gm-Message-State: AC+VfDx3xP/CORDKgQRo88eZBe0FdmkOktd8cQ/a+SojN6m+qatxbhGJ YZbskNRUQc3mP4ze7+v2dlK73IA+FjTUoqNEv9YLGg== X-Google-Smtp-Source: ACHHUZ5IgyouWvWeLGBfBg0yj3gROy/TbpmhW8VxUOZokhW990bn4YbO202LWgfSsf2rvZTI7F6MrQ== X-Received: by 2002:a05:6e02:4cd:b0:32b:2884:667d with SMTP id f13-20020a056e0204cd00b0032b2884667dmr5629367ils.7.1684441091381; Thu, 18 May 2023 13:18:11 -0700 (PDT) Received: from localhost.localdomain (75-166-157-55.hlrn.qwest.net. [75.166.157.55]) by smtp.gmail.com with ESMTPSA id i9-20020a05663813c900b00418ba399842sm703087jaj.13.2023.05.18.13.18.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 13:18:11 -0700 (PDT) From: Tom Tromey Date: Thu, 18 May 2023 14:18:10 -0600 Subject: [PATCH v2 4/9] Change mi_parse_argv to a method MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230404-dap-loaded-sources-v2-4-93f229095e03@adacore.com> References: <20230404-dap-loaded-sources-v2-0-93f229095e03@adacore.com> In-Reply-To: <20230404-dap-loaded-sources-v2-0-93f229095e03@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: This changes mi_parse_argv to be a method of mi_parse. This is just a minor cleanup. --- gdb/mi/mi-cmds.c | 2 +- gdb/mi/mi-parse.c | 8 ++++---- gdb/mi/mi-parse.h | 7 +++---- gdb/python/py-micmd.c | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c index ca8c633e218..f8cae4131d8 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 bf3b534e590..f077eb36a7c 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 d4ac3f002e4..edb61547354 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 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 */ diff --git a/gdb/python/py-micmd.c b/gdb/python/py-micmd.c index 88d52db2202..7027210d0d8 100644 --- a/gdb/python/py-micmd.c +++ b/gdb/python/py-micmd.c @@ -355,7 +355,7 @@ mi_command_py::invoke (struct mi_parse *parse) const pymicmd_debug_printf ("this = %p, name = %s", this, name ()); - mi_parse_argv (parse->args (), parse); + parse->parse_argv (); if (parse->argv == nullptr) error (_("Problem parsing arguments: %s %s"), parse->command, -- 2.40.0