From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1285 invoked by alias); 13 Oct 2016 21:11:13 -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 1172 invoked by uid 89); 13 Oct 2016 21:11:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=no version=3.3.2 spammy=htab, htab_t, 91,9, 919 X-HELO: gproxy10-pub.mail.unifiedlayer.com Received: from gproxy10-pub.mail.unifiedlayer.com (HELO gproxy10-pub.mail.unifiedlayer.com) (69.89.20.226) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Thu, 13 Oct 2016 21:11:03 +0000 Received: (qmail 11133 invoked by uid 0); 13 Oct 2016 21:11:02 -0000 Received: from unknown (HELO cmgw4) (10.0.90.85) by gproxy10.mail.unifiedlayer.com with SMTP; 13 Oct 2016 21:11:02 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id v9AK1t00k2f2jeq019ANoT; Thu, 13 Oct 2016 15:10:22 -0600 X-Authority-Analysis: v=2.1 cv=IecUBwaa c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=CH0kA5CcgfcA:10 a=zstS-IiYAAAA:8 a=b2DK-Su-xdErKaQxu6UA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:42448 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1bunGd-00011Z-9M; Thu, 13 Oct 2016 15:10:19 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v2 02/17] Use scoped_restore for ui_file Date: Thu, 13 Oct 2016 21:11:00 -0000 Message-Id: <1476393012-29987-3-git-send-email-tom@tromey.com> In-Reply-To: <1476393012-29987-1-git-send-email-tom@tromey.com> References: <1476393012-29987-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1bunGd-00011Z-9M X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:42448 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-SW-Source: 2016-10/txt/msg00393.txt.bz2 This replaces all the uses of make_cleanup_restore_ui_file with scoped_restore. 2016-09-26 Tom Tromey * utils.c (make_cleanup_restore_ui_file, do_restore_ui_file) (struct restore_ui_file_closure): Remove. * utils.h (make_cleanup_restore_ui_file): Don't declare. * guile/scm-ports.c (ioscm_with_output_to_port_worker): Use scoped_restore. * top.c (execute_command_to_string): Use scoped_restore. --- gdb/ChangeLog | 9 +++++++++ gdb/guile/scm-ports.c | 10 ++++------ gdb/top.c | 16 ++++++---------- gdb/utils.c | 29 ----------------------------- gdb/utils.h | 3 --- 5 files changed, 19 insertions(+), 48 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 775fa81..8539d0e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2016-09-26 Tom Tromey + + * utils.c (make_cleanup_restore_ui_file, do_restore_ui_file) + (struct restore_ui_file_closure): Remove. + * utils.h (make_cleanup_restore_ui_file): Don't declare. + * guile/scm-ports.c (ioscm_with_output_to_port_worker): Use + scoped_restore. + * top.c (execute_command_to_string): Use scoped_restore. + 2016-10-13 Tom Tromey * common/scoped_restore.h: New file. diff --git a/gdb/guile/scm-ports.c b/gdb/guile/scm-ports.c index 5559475..dea9077 100644 --- a/gdb/guile/scm-ports.c +++ b/gdb/guile/scm-ports.c @@ -524,15 +524,13 @@ ioscm_with_output_to_port_worker (SCM port, SCM thunk, enum oport oport, make_cleanup_ui_file_delete (port_file); + scoped_restore save_file = make_scoped_restore (oport == GDB_STDERR + ? &gdb_stderr : &gdb_stdout); + if (oport == GDB_STDERR) - { - make_cleanup_restore_ui_file (&gdb_stderr); - gdb_stderr = port_file; - } + gdb_stderr = port_file; else { - make_cleanup_restore_ui_file (&gdb_stdout); - if (ui_out_redirect (current_uiout, port_file) < 0) warning (_("Current output protocol does not support redirection")); else diff --git a/gdb/top.c b/gdb/top.c index ce41bc9..f6176ae 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -705,22 +705,18 @@ execute_command_to_string (char *p, int from_tty) str_file = mem_fileopen (); make_cleanup_ui_file_delete (str_file); - make_cleanup_restore_ui_file (&gdb_stdout); - make_cleanup_restore_ui_file (&gdb_stderr); - make_cleanup_restore_ui_file (&gdb_stdlog); - make_cleanup_restore_ui_file (&gdb_stdtarg); - make_cleanup_restore_ui_file (&gdb_stdtargerr); if (ui_out_redirect (current_uiout, str_file) < 0) warning (_("Current output protocol does not support redirection")); else make_cleanup_ui_out_redirect_pop (current_uiout); - gdb_stdout = str_file; - gdb_stderr = str_file; - gdb_stdlog = str_file; - gdb_stdtarg = str_file; - gdb_stdtargerr = str_file; + scoped_restore save_stdout = make_scoped_restore (&gdb_stdout, str_file); + scoped_restore save_stderr = make_scoped_restore (&gdb_stderr, str_file); + scoped_restore save_stdlog = make_scoped_restore (&gdb_stdlog, str_file); + scoped_restore save_stdtarg = make_scoped_restore (&gdb_stdtarg, str_file); + scoped_restore save_stdtargerr = make_scoped_restore (&gdb_stdtargerr, + str_file); execute_command (p, from_tty); diff --git a/gdb/utils.c b/gdb/utils.c index 6feeb4d..e50177d 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -319,35 +319,6 @@ make_cleanup_htab_delete (htab_t htab) return make_cleanup (do_htab_delete_cleanup, htab); } -struct restore_ui_file_closure -{ - struct ui_file **variable; - struct ui_file *value; -}; - -static void -do_restore_ui_file (void *p) -{ - struct restore_ui_file_closure *closure - = (struct restore_ui_file_closure *) p; - - *(closure->variable) = closure->value; -} - -/* Remember the current value of *VARIABLE and make it restored when - the cleanup is run. */ - -struct cleanup * -make_cleanup_restore_ui_file (struct ui_file **variable) -{ - struct restore_ui_file_closure *c = XNEW (struct restore_ui_file_closure); - - c->variable = variable; - c->value = *variable; - - return make_cleanup_dtor (do_restore_ui_file, (void *) c, xfree); -} - /* Helper for make_cleanup_value_free_to_mark. */ static void diff --git a/gdb/utils.h b/gdb/utils.h index c4944e1..36f5294 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -91,9 +91,6 @@ extern struct cleanup *make_cleanup_restore_uinteger (unsigned int *variable); struct target_ops; extern struct cleanup *make_cleanup_unpush_target (struct target_ops *ops); -extern struct cleanup * - make_cleanup_restore_ui_file (struct ui_file **variable); - extern struct cleanup *make_cleanup_value_free_to_mark (struct value *); extern struct cleanup *make_cleanup_value_free (struct value *); -- 2.7.4