From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 45630 invoked by alias); 2 Jun 2017 18:31:50 -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 45597 invoked by uid 89); 2 Jun 2017 18:31:49 -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 18:31:48 +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 1BC88334584; Fri, 2 Jun 2017 18:31:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1BC88334584 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 1BC88334584 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 707555C550; Fri, 2 Jun 2017 18:31:50 +0000 (UTC) Subject: Re: [RFA 12/23] More uses of scoped_restore To: Tom Tromey , gdb-patches@sourceware.org References: <20170503224626.2818-1-tom@tromey.com> <20170503224626.2818-13-tom@tromey.com> From: Pedro Alves Message-ID: Date: Fri, 02 Jun 2017 18:31: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-13-tom@tromey.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2017-06/txt/msg00063.txt.bz2 On 05/03/2017 11:46 PM, Tom Tromey wrote: > @@ -8635,7 +8614,8 @@ remote_serial_write (const char *str, int len) > struct remote_state *rs = get_remote_state (); > struct cleanup *old_chain; This cleanup variable can be removed. > > - old_chain = make_cleanup_override_quit_handler (remote_serial_quit_handler); > + scoped_restore restore_quit > + = make_scoped_restore (&quit_handler, remote_serial_quit_handler); > > rs->got_ctrlc_during_io = 0; > > @@ -56,12 +47,11 @@ exec_reverse_once (const char *cmd, char *args, int from_tty) > if (!target_can_execute_reverse) > error (_("Target %s does not support this command."), target_shortname); > > - reverse_command = xstrprintf ("%s %s", cmd, args ? args : ""); > - old_chain = make_cleanup (exec_direction_default, NULL); > - make_cleanup (xfree, reverse_command); > + std::string reverse_command = string_printf ("%s %s", cmd, args ? args : ""); > + scoped_restore restore_exec_dir > + = make_scoped_restore (&execution_direction, EXEC_REVERSE); > execution_direction = EXEC_REVERSE; This assignment is now unnecessary. OK with those changes. Thanks, Pedro Alves