From patchwork Tue Apr 4 17:08:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67271 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 E25DC3857C4F for ; Tue, 4 Apr 2023 17:09:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E25DC3857C4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680628163; bh=34+CWNNpsk+jaiKId5SZk3RGQZdppNNQDOz5AxwXLww=; 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=GCrriqH/6umi8vzMZgpzRNPE4Il23duder8xmdXr2E703+yVTW556pLXHSDtWocjQ McNsQoZs7deT3avEi456LUbOYZRn+WUWBNZ6n+ZDv1EJ/BeA9AzvQYGmUcZBUCyBvH XhrKhQex0/NR5AgKJrDA4UX55qleJd4Ac2klsz7I= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) by sourceware.org (Postfix) with ESMTPS id 7D06E3858C62 for ; Tue, 4 Apr 2023 17:08:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D06E3858C62 Received: by mail-il1-x12d.google.com with SMTP id n1so16716397ili.10 for ; Tue, 04 Apr 2023 10:08:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680628132; 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=34+CWNNpsk+jaiKId5SZk3RGQZdppNNQDOz5AxwXLww=; b=2yxanbcDlcLnKB9jY1BRUrDyLe8DCc1CwoaB93wUu9DDfujmJSPIsj9e60bFOkKPAp /eqcW+cS5IC1zkN3ciOrpAlwDemQo0V2Vs+KnwWOVOWaXChx7LW2hDpPPeOKHfttV4we U756sg71URcgSNN8i4XOjK0Qm8TD56ScGJLapkTq4vz9BtVRz3B8W4OpNICWAzhD+REB DQVfMriyQyC9NNS4FDhmk0wSveyjOEtUHF7IDEpXLzx+mehyu+/VvKdP8j/e0jy4Z11K BDOQskTu54cDnXy/jC37cryJbGpDrLDR3/8zc4FRBUj/v/vMHig2Up0crJ24wHzmFyKi 1LaQ== X-Gm-Message-State: AAQBX9fJRFo1rUmOSZN9A1ZXMdyVUW3gQiUrb0hMOKexGFr9Vx7nWKsi KvT9iOC7qIE49lBsP8QHJElLq67/pAs1x0k/ZV67yw== X-Google-Smtp-Source: AKy350Z7z26XRAqFrFCLRIG2ImKcCSHns6nQwe+Re+goggIsV7jEg5BgJXOmDmjyg3CMB/8JLdmAsQ== X-Received: by 2002:a92:6e0a:0:b0:326:4898:c631 with SMTP id j10-20020a926e0a000000b003264898c631mr2363865ilc.1.1680628132542; Tue, 04 Apr 2023 10:08:52 -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.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 10:08:52 -0700 (PDT) Date: Tue, 04 Apr 2023 11:08:50 -0600 Subject: [PATCH 2/9] Use member initializers in mi_parse MIME-Version: 1.0 Message-Id: <20230404-dap-loaded-sources-v1-2-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 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 e334968cc88..3bf944763f1 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