[PATCH 30/36] quit_force: Replace TRY_CATCH wrapper macros

Pedro Alves
2015-02-09T23:54:22Z

From: Tom Tromey <tromey@redhat.com>

More preparation for running the TRY_CATCH->TRY/CATCH conversion
script.

gdb/ChangeLog:
2014-05-12 Tom Tromey <tromey@redhat.com>

* 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);
}
--
1.9.3