From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 71210 invoked by alias); 2 Jun 2017 17:24:39 -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 71085 invoked by uid 89); 2 Jun 2017 17:24:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= 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; Fri, 02 Jun 2017 17:24:22 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8438E7FD43; Fri, 2 Jun 2017 17:24:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8438E7FD43 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8438E7FD43 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 CFE76777C8; Fri, 2 Jun 2017 17:24:23 +0000 (UTC) Subject: Re: [RFA 03/23] Use gdb_file_up in find_and_open_script To: Tom Tromey , gdb-patches@sourceware.org References: <20170503224626.2818-1-tom@tromey.com> <20170503224626.2818-4-tom@tromey.com> From: Pedro Alves Message-ID: <8e575587-67d5-3d19-a70b-646a6b712e07@redhat.com> Date: Fri, 02 Jun 2017 17:24: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: <20170503224626.2818-4-tom@tromey.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2017-06/txt/msg00055.txt.bz2 On 05/03/2017 11:46 PM, Tom Tromey wrote: > This changes find_and_open_script to return a gdb_file_up. The result > is also used to indicate whether the function succeeded, so the patch > also removes the "streamp" argument; and finally, the type of the > "full_path" argument is changed to remove more cleanups from the > callers. > This is OK. > -extern int find_and_open_script (const char *file, int search_path, > - FILE **streamp, char **full_path); > +extern gdb_file_up > + find_and_open_script (const char *file, int search_path, > + gdb::unique_xmalloc_ptr *full_path); > Though I wonder whether using gdb::optional wouldn't look clearer: /* The script that was opened. */ struct open_script { gdb_file_up stream; gdb::unique_xmalloc_ptr full_path; }; gdb::optional find_and_open_script (const char *file, int search_path); open_script opened = find_and_open_script (file, 1 /*search_path*/); if (opened) { if (!file_is_auto_load_safe (res->full_path.get (), _("auto-load: Loading %s script " "\"%s\" from section \"%s\" of " "objfile \"%s\".\n"), ext_lang_name (language), opened->full_path.get (), section_name, objfile_name (objfile))) opened.reset (); } ... /* If this file is not currently loaded, load it. */ if (opened && !in_hash_table) sourcer (language, objfile, opened->stream, opened->full_path.get ()); } Thanks, Pedro Alves