From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id 97B7E384604C for ; Mon, 20 Jun 2022 13:46:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 97B7E384604C Received: by mail-il1-x131.google.com with SMTP id k18so1886099ilr.11 for ; Mon, 20 Jun 2022 06:46:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+7/vaL4GR3gJGoPW7e/5LBi1CbZnPMkvbxcMlzRAMeI=; b=W2Z2dVski7VqMUMeb6ZrG+YIRM5MvzGf4vsO6cG+S+aAUIR1/zNAYGol4pNBSZAnkL JI9EbThle6tBerSAkOJWHzeUeWd8V1km8RlLbxMhS9YInGOGICywC/wkhKBXVkBJ5Jyl /MEVSK4v4d2rj/VoL+GXbQ4EnlEOaggXuKNJJ5qnyb+m2Wxmb1Z9DeAJuDPYLPoZGasX kH1hvjH7yjaaQamNKQE5G0XHnGnk0NgXTgUb3kW0zJTEdXMluwcQW92q+Mo1RnqR+Mkg DnRFJlf2foPmQlpq0lUcs27HJavz7K6Q9zJQSSXWyfCE7PqI8RMHBBw6qDRHVSQtsgdG 2nCg== X-Gm-Message-State: AJIora9TLdr7gB/Pni47oBfEKFeChVPabldFy79tSh1bGq3BahMpH0pM bRLH/sKq6YiJ54GmRAWUtFocT/JLLKObug== X-Google-Smtp-Source: AGRyM1uV2GNqsTL/MPUJvDSIAN95BTsXArMqGDY7JQNb20YnPapGeLVQiHkdzFNUMpkjvKJmYBXNNg== X-Received: by 2002:a92:d80a:0:b0:2d8:b37e:2c9c with SMTP id y10-20020a92d80a000000b002d8b37e2c9cmr13152030ilm.265.1655732813831; Mon, 20 Jun 2022 06:46:53 -0700 (PDT) Received: from murgatroyd.Home (71-211-187-180.hlrn.qwest.net. [71.211.187.180]) by smtp.gmail.com with ESMTPSA id x68-20020a6bc747000000b006692192baf7sm6636354iof.25.2022.06.20.06.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 06:46:53 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 1/3] Use unique_xmalloc_ptr in interp Date: Mon, 20 Jun 2022 07:46:48 -0600 Message-Id: <20220620134650.2664575-2-tromey@adacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220620134650.2664575-1-tromey@adacore.com> References: <20220620134650.2664575-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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-List-Received-Date: Mon, 20 Jun 2022 13:46:56 -0000 This changes interp::m_name to be a unique_xmalloc_ptr, removing some manual memory management. It also cleans up the initialization of the 'inited' member, and moves the 'private:' and 'public:' keywords to their proper spots. --- gdb/interps.c | 4 +--- gdb/interps.h | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 44002ff2cb5..0c440e78685 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -79,14 +79,12 @@ static struct interp *interp_lookup_existing (struct ui *ui, const char *name); interp::interp (const char *name) - : m_name (xstrdup (name)) + : m_name (make_unique_xstrdup (name)) { - this->inited = false; } interp::~interp () { - xfree (m_name); } /* An interpreter factory. Maps an interpreter name to the factory diff --git a/gdb/interps.h b/gdb/interps.h index 330c1ba6615..e393b08c962 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -78,20 +78,20 @@ class interp const char *name () const { - return m_name; + return m_name.get (); } - /* This is the name in "-i=" and "set interpreter". */ private: - char *m_name; + /* This is the name in "-i=" and "set interpreter". */ + gdb::unique_xmalloc_ptr m_name; +public: /* Interpreters are stored in a linked list, this is the next one... */ -public: struct interp *next; /* Has the init method been run? */ - bool inited; + bool inited = false; }; /* Look up the interpreter for NAME, creating one if none exists yet. -- 2.34.1