From patchwork Mon Feb 9 23:20:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 5014 Received: (qmail 13541 invoked by alias); 9 Feb 2015 23:54:22 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 13514 invoked by uid 89); 9 Feb 2015 23:54:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 09 Feb 2015 23:54:20 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19NLplp006119 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 18:21:51 -0500 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t19NKkut026307 for ; Mon, 9 Feb 2015 18:21:50 -0500 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 30/36] quit_force: Replace TRY_CATCH wrapper macros Date: Mon, 9 Feb 2015 23:20:40 +0000 Message-Id: <1423524046-20605-31-git-send-email-palves@redhat.com> In-Reply-To: <1423524046-20605-1-git-send-email-palves@redhat.com> References: <1423524046-20605-1-git-send-email-palves@redhat.com> From: Tom Tromey More preparation for running the TRY_CATCH->TRY/CATCH conversion script. gdb/ChangeLog: 2014-05-12 Tom Tromey * top.c (quit_force): Inline and delete DO_TRY, DO_PRINT_EX. --- gdb/top.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/gdb/top.c b/gdb/top.c index 55c6896..699a399 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1481,47 +1481,43 @@ quit_force (char *args, int from_tty) qt.args = args; qt.from_tty = from_tty; - /* Wrappers to make the code below a bit more readable. */ -#define DO_TRY \ - TRY_CATCH (ex, RETURN_MASK_ALL) - -#define DO_PRINT_EX \ - if (ex.reason < 0) \ - exception_print (gdb_stderr, ex) - /* We want to handle any quit errors and exit regardless. */ /* Get out of tfind mode, and kill or detach all inferiors. */ - DO_TRY + TRY_CATCH (ex, RETURN_MASK_ALL) { disconnect_tracing (); iterate_over_inferiors (kill_or_detach, &qt); } - DO_PRINT_EX; + if (ex.reason < 0) + exception_print (gdb_stderr, ex); /* Give all pushed targets a chance to do minimal cleanup, and pop them all out. */ - DO_TRY + TRY_CATCH (ex, RETURN_MASK_ALL) { pop_all_targets (); } - DO_PRINT_EX; + if (ex.reason < 0) + exception_print (gdb_stderr, ex); /* Save the history information if it is appropriate to do so. */ - DO_TRY + TRY_CATCH (ex, RETURN_MASK_ALL) { if (write_history_p && history_filename && input_from_terminal_p ()) gdb_safe_append_history (); } - DO_PRINT_EX; + if (ex.reason < 0) + exception_print (gdb_stderr, ex); /* Do any final cleanups before exiting. */ - DO_TRY + TRY_CATCH (ex, RETURN_MASK_ALL) { do_final_cleanups (all_cleanups ()); } - DO_PRINT_EX; + if (ex.reason < 0) + exception_print (gdb_stderr, ex); exit (exit_code); }