From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by sourceware.org (Postfix) with ESMTPS id D6DFA3858C41 for ; Thu, 18 May 2023 20:18:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6DFA3858C41 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-x134.google.com with SMTP id e9e14a558f8ab-332cc0efe88so18715545ab.0 for ; Thu, 18 May 2023 13:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1684441090; x=1687033090; 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=ScFJWc6g+WqX8XELLWDsXZDankrNhZGpKmimJH/cvXg=; b=VlqTYpZwFetytQudxtIaEznAEoyb9NeK2rEWQTQ+KyollgO1ebsZi4K6yuVJkFpvg9 l18b2nixK1pkUG7vYAqxBrzK0OvbjtEbWRlkE+7LDYmiFQN4H+PxdGv1qpxZubVDNNHd x3O98ggsjF4MoDYAqLctNXO6oqsIe1H9KH24DY4RGi3HhAK/HudL6TMz8t6TBA7AzT7d gWOwjNwM2qcsqe0F05GHsl7sF80kvDclydOUQCPJzVB1nb5Ujwke0u3nCIrlnciNpxb7 3RhZ2Ziij4KdnjkuBM9mdY7RV99+OmYXWZps1W0+BmKQSMRKdFZRPd9Bo49rLKmt3YSf KnNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684441090; x=1687033090; 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=ScFJWc6g+WqX8XELLWDsXZDankrNhZGpKmimJH/cvXg=; b=H/LD6UGk19s+b+CbpChRSz5PwvF+URQ1g1yoDvnJCe30uKpb4We8Nke1oskl0qIrWJ gyu2NQuwl/wlCqDXBaK+Bl2B/R8qkf8XylxGXA2s4vGm3uI4Y8vJBMwFtG+4AnxCfiFU CI8JGE9wxABRGmXE1p85vfsVRjRb8rdMVt62gjixQZnzlp9acgmzOyByrtWx27xz+1ld +Y23OUNZstBzONqvvN/5Rsz++/z7UqAHxG0S9VdOmJdTjuKuy9ZmyxwF/4afY0ee/oMU giXWh3Eq9U63pJ8+Du+05QsuwbUmk+tzBOwEV6qXNGbb3fwxU6+nWDblrz23tt7C1y3Z w2TQ== X-Gm-Message-State: AC+VfDy6kGe0rqm8vIfCs0YCoehBDo9Jl6XHCGdLvn5EyyblfGVTq8/0 ihmfb+2TN6NWk8WbY//VVU2e/HkUyNrGZQ1ue0C7mA== X-Google-Smtp-Source: ACHHUZ6V4Y6I2uFpJHpA7Xd9YEhLzNBOpzzlk9M6O9SHcZ4MbTCtjiNIlkx1PN5A7uzqWE79/ogYVg== X-Received: by 2002:a92:dd07:0:b0:331:2a69:96fe with SMTP id n7-20020a92dd07000000b003312a6996femr5888361ilm.1.1684441090173; Thu, 18 May 2023 13:18:10 -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.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 13:18:09 -0700 (PDT) From: Tom Tromey Date: Thu, 18 May 2023 14:18:08 -0600 Subject: [PATCH v2 2/9] Use member initializers in mi_parse MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230404-dap-loaded-sources-v2-2-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.0 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 to use member initializers rather than a constructor. This is easier to follow. --- gdb/mi/mi-parse.c | 17 ----------------- gdb/mi/mi-parse.h | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index 737ec57eddd..bda554a568e 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -208,23 +208,6 @@ mi_parse_argv (const char *args, struct mi_parse *parse) } } -mi_parse::mi_parse () - : op (MI_COMMAND), - command (NULL), - token (NULL), - cmd (NULL), - cmd_start (NULL), - args (NULL), - argv (NULL), - argc (0), - all (0), - thread_group (-1), - thread (-1), - frame (-1), - language (language_unknown) -{ -} - mi_parse::~mi_parse () { xfree (command); diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h index e34796988a4..75bb36b1c77 100644 --- a/gdb/mi/mi-parse.h +++ b/gdb/mi/mi-parse.h @@ -41,27 +41,27 @@ enum mi_command_type struct mi_parse { - mi_parse (); + mi_parse () = default; ~mi_parse (); DISABLE_COPY_AND_ASSIGN (mi_parse); - enum mi_command_type op; - char *command; - char *token; - const struct mi_command *cmd; - struct mi_timestamp *cmd_start; - char *args; - char **argv; - int argc; - int all; - int thread_group; /* At present, the same as inferior number. */ - int thread; - int frame; + enum mi_command_type op = MI_COMMAND; + char *command = nullptr; + char *token = nullptr; + const struct mi_command *cmd = nullptr; + struct mi_timestamp *cmd_start = nullptr; + char *args = nullptr; + char **argv = nullptr; + int argc = 0; + int all = 0; + int thread_group = -1; /* At present, the same as inferior number. */ + int thread = -1; + int frame = -1; /* The language that should be used to evaluate the MI command. Ignored if set to language_unknown. */ - enum language language; + enum language language = language_unknown; }; /* Attempts to parse CMD returning a ``struct mi_parse''. If CMD is -- 2.40.0