Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 09:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

quit_force: Replace TRY_CATCH wrapper macros

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

gdb/ChangeLog:
2015-03-07  Tom Tromey  <tromey@redhat.com>

	* top.c (quit_force): Inline and delete DO_TRY, DO_PRINT_EX.
This commit is contained in:
Tom Tromey
2015-03-07 14:50:04 +00:00
committed by Pedro Alves
parent 7556d4a4f6
commit ece957c859
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@@ -1,3 +1,7 @@
2015-03-07 Tom Tromey <tromey@redhat.com>
* top.c (quit_force): Inline and delete DO_TRY, DO_PRINT_EX.
2015-03-07 Pedro Alves <palves@redhat.com>
* amd64-tdep.c (amd64_frame_cache, amd64_sigtramp_frame_cache)

28
gdb/top.c
View File

@@ -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);
}