From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103533 invoked by alias); 28 Sep 2017 09:36:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 103402 invoked by uid 89); 28 Sep 2017 09:36:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS,T_FILL_THIS_FORM_SHORT autolearn=ham version=3.3.2 spammy=Hx-languages-length:1968, letter X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 Sep 2017 09:36:16 +0000 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17365E1846; Thu, 28 Sep 2017 09:36:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 17365E1846 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=palves@redhat.com Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57B605ED44; Thu, 28 Sep 2017 09:36:14 +0000 (UTC) Subject: Re: [RFA 03/11] Remove cleanups from mi-cmd-var.c To: Tom Tromey , gdb-patches@sourceware.org References: <20170912185736.20436-1-tom@tromey.com> <20170912185736.20436-4-tom@tromey.com> From: Pedro Alves Message-ID: Date: Thu, 28 Sep 2017 09:36:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20170912185736.20436-4-tom@tromey.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2017-09/txt/msg00853.txt.bz2 On 09/12/2017 07:57 PM, Tom Tromey wrote: > diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c > index 8b22b2f..b628814 100644 > --- a/gdb/mi/mi-cmd-var.c > +++ b/gdb/mi/mi-cmd-var.c > @@ -95,32 +95,21 @@ mi_cmd_var_create (const char *command, char **argv, int argc) > struct ui_out *uiout = current_uiout; > CORE_ADDR frameaddr = 0; > struct varobj *var; > - char *name; > char *frame; > char *expr; > - struct cleanup *old_cleanups; > enum varobj_type var_type; > > if (argc != 3) > error (_("-var-create: Usage: NAME FRAME EXPRESSION.")); > > - name = xstrdup (argv[0]); > - /* Add cleanup for name. Must be free_current_contents as name can > - be reallocated. */ > - old_cleanups = make_cleanup (free_current_contents, &name); > - > - frame = xstrdup (argv[1]); > - make_cleanup (xfree, frame); > + std::string name = argv[0]; > > - expr = xstrdup (argv[2]); > - make_cleanup (xfree, expr); > + frame = argv[1]; > + expr = argv[2]; > > - if (strcmp (name, "-") == 0) > - { > - xfree (name); > - name = varobj_gen_name (); > - } > - else if (!isalpha (*name)) > + if (name == "-") > + name = varobj_gen_name (); > + else if (!isalpha (name[0])) > error (_("-var-create: name of object must begin with a letter")); name was a deep copy of argv[0] up to here. That copy appears unnecessary, if you write it like this: std::string name; if (strcmp (argv[0], "-") == 0) name = varobj_gen_name (); else if (!isalpha (*argv[0])) error (_("-var-create: name of object must begin with a letter")); else name = argv[0]; There's still a deep copy in that last else above. We should be able to get rid of that like this: const char *name; std::string gen_name; if (strcmp (argv[0], "-") == 0) { gen_name = varobj_gen_name (); name = gen_name.c_str (); } else if (!isalpha (*argv[0])) error (_("-var-create: name of object must begin with a letter")); else name = argv[0]; Otherwise OK. Thanks, Pedro Alves