From patchwork Tue Apr 4 17:08:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67275 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 760F138432D6 for ; Tue, 4 Apr 2023 17:10:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 760F138432D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680628201; bh=kQGpntrXprDNTor/a8K0xjNQAZr0xLlYD9/pPdRcbxQ=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=qEoHB7zGUYrGVBjazLlpbk6g6IJSrEsWH+3jmyBHKXp7lwC8q48KnOpU63wUBV/Of hEnFzzFlM6bwB069SzmcVjAObt0RKM03ZOJJVkKndEwBmJR1G66E7zKlL+L5aB6+iu Tcg/xDwWhi7n1gXkInk07dwWdysYpBuORhTYvtCQ= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 7F6003858C78 for ; Tue, 4 Apr 2023 17:08:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7F6003858C78 Received: by mail-il1-x135.google.com with SMTP id j2so10419964ila.8 for ; Tue, 04 Apr 2023 10:08:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680628133; 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=kQGpntrXprDNTor/a8K0xjNQAZr0xLlYD9/pPdRcbxQ=; b=Qy40d3cRgYmF3VgPue9Xnh2CSXIitCSTGukCsm6CrMZyPsVUJNyadDwug1gxo+qY2W F4s30G/MvdQMqgwZLhuMn7qLQm7ibbED6melxJ0aP/4Tr6spjIp3J8tJdWVvTuplkGza FYjAlov76bBBGilURrG9M454TJEgbDsS6Pm82LLXP1PWgVwV1szHdJs8Coq3k7tff5Kw 01Dl72uKqGh3pUx6GWGQ0Kcrm0Q8LN9CrXSuWQFZ6yfxGkAAgAgshoDfrMU/b9mrfdys p3AHOp1TN9rxgUgYcK27DUHsBaTan4mKyKj400JV4LGlvnL2wBHyao5xfWRKsQrYK6Xr JVLw== X-Gm-Message-State: AAQBX9dkpoZ0Lt+JqYsaXUPR6Rtdiq0+rIsEDt1+V+dE3fPTUrKE68wG XaMpHDNExsRsrztoFjmed0M80ygLBlQu0T10Akk13A== X-Google-Smtp-Source: AKy350aIBhdy8UNxCPTz3YT208qpeS+9NoKCGEN8171dfpYcIU0JHEmsi6PIWXTGgqun6P4Dyg3WWw== X-Received: by 2002:a92:d749:0:b0:31f:9b6e:2f4d with SMTP id e9-20020a92d749000000b0031f9b6e2f4dmr2473665ilq.0.1680628133624; Tue, 04 Apr 2023 10:08:53 -0700 (PDT) Received: from localhost.localdomain (71-211-185-113.hlrn.qwest.net. [71.211.185.113]) by smtp.gmail.com with ESMTPSA id f4-20020a02a104000000b0040b4c29010fsm1188306jag.140.2023.04.04.10.08.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 10:08:53 -0700 (PDT) Date: Tue, 04 Apr 2023 11:08:52 -0600 Subject: [PATCH 4/9] Change mi_parse_argv to a method MIME-Version: 1.0 Message-Id: <20230404-dap-loaded-sources-v1-4-75c796bd644b@adacore.com> References: <20230404-dap-loaded-sources-v1-0-75c796bd644b@adacore.com> In-Reply-To: <20230404-dap-loaded-sources-v1-0-75c796bd644b@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 X-Spam-Status: No, score=-11.6 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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 41399fc619e..db3c4ae2368 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 af89be693da..3c2555c7665 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,