From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29976 invoked by alias); 11 Sep 2017 20:25:51 -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 29926 invoked by uid 89); 11 Sep 2017 20:25:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: smtp.polymtl.ca Received: from smtp.polymtl.ca (HELO smtp.polymtl.ca) (132.207.4.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 11 Sep 2017 20:25:36 +0000 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id v8BKPTcc006296 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 11 Sep 2017 16:25:34 -0400 Received: by simark.ca (Postfix, from userid 112) id C81B61ECDF; Mon, 11 Sep 2017 16:25:29 -0400 (EDT) Received: from simark.ca (localhost [127.0.0.1]) by simark.ca (Postfix) with ESMTP id C49B21EA19; Mon, 11 Sep 2017 16:25:28 -0400 (EDT) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 11 Sep 2017 20:25:00 -0000 From: Simon Marchi To: Tom Tromey Cc: gdb-patches@sourceware.org Subject: Re: [RFA 5/8] Remove cleanups from find_frame_funname In-Reply-To: <20170910215037.24329-6-tom@tromey.com> References: <20170910215037.24329-1-tom@tromey.com> <20170910215037.24329-6-tom@tromey.com> Message-ID: X-Sender: simon.marchi@polymtl.ca User-Agent: Roundcube Webmail/1.3.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Mon, 11 Sep 2017 20:25:30 +0000 X-IsSubscribed: yes X-SW-Source: 2017-09/txt/msg00312.txt.bz2 > diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c > index b2af743..f504a88 100644 > --- a/gdb/guile/scm-frame.c > +++ b/gdb/guile/scm-frame.c > @@ -418,7 +418,7 @@ static SCM > gdbscm_frame_name (SCM self) > { > frame_smob *f_smob; > - char *name = NULL; > + gdb::unique_xmalloc_ptr name; > enum language lang = language_minimal; > struct frame_info *frame = NULL; > SCM result; > @@ -429,11 +429,10 @@ gdbscm_frame_name (SCM self) > { > frame = frscm_frame_smob_to_frame (f_smob); > if (frame != NULL) > - find_frame_funname (frame, &name, &lang, NULL); > + name = find_frame_funname (frame, &lang, NULL); > } > CATCH (except, RETURN_MASK_ALL) > { > - xfree (name); > GDBSCM_HANDLE_GDB_EXCEPTION (except); > } > END_CATCH > @@ -446,8 +445,7 @@ gdbscm_frame_name (SCM self) > > if (name != NULL) > { > - result = gdbscm_scm_from_c_string (name); > - xfree (name); > + result = gdbscm_scm_from_c_string (name.get ()); > } Nit: curly braces not needed. Simon