diff options
| author | Pedro Alves <palves@redhat.com> | 2011-08-04 18:19:27 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2011-08-04 18:19:27 +0000 |
| commit | f9679975a3374a650ce5ffc8a512b85d662bfcbf (patch) | |
| tree | dcae2ee7ee8e1f89c9f3ee86d72978e328ddef8e /gdb/exceptions.h | |
| parent | a1e28cb2af1ec61d0dea8c9280e52e7153df2df8 (diff) | |
2011-08-04 Pedro Alves <pedro@codesourcery.com>
* exceptions.c (struct catcher): Remove saved_uiout field.
(exceptions_state_mc_init): Remove the `func_uiout' parameter, and
no longer save/resvore the global ui_out builder.
(catch_exceptions_with_msg): Save/override/restore the global
ui_out builder manually instead of relying on TRY_CATCH to do it.
(catch_errors): Save/restore the global ui_out builder manually
instead of relying on TRY_CATCH to do it.
* exceptions.h (exceptions_state_mc_init): Remove the `func_uiout'
parameter.
(TRY_CATCH): Adjust.
* cli/cli-interp.c (safe_execute_command): Save/override/restore
the global ui_out builder manually instead of relying on TRY_CATCH
to do it.
Diffstat (limited to 'gdb/exceptions.h')
| -rw-r--r-- | gdb/exceptions.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gdb/exceptions.h b/gdb/exceptions.h index c1bc605563..9e306e4d38 100644 --- a/gdb/exceptions.h +++ b/gdb/exceptions.h @@ -114,8 +114,7 @@ extern const struct gdb_exception exception_none; /* Functions to drive the exceptions state m/c (internal to exceptions). */ -EXCEPTIONS_SIGJMP_BUF *exceptions_state_mc_init (struct ui_out *func_uiout, - volatile struct +EXCEPTIONS_SIGJMP_BUF *exceptions_state_mc_init (volatile struct gdb_exception *exception, return_mask mask); int exceptions_state_mc_action_iter (void); @@ -146,7 +145,7 @@ int exceptions_state_mc_action_iter_1 (void); #define TRY_CATCH(EXCEPTION,MASK) \ { \ EXCEPTIONS_SIGJMP_BUF *buf = \ - exceptions_state_mc_init (uiout, &(EXCEPTION), (MASK)); \ + exceptions_state_mc_init (&(EXCEPTION), (MASK)); \ EXCEPTIONS_SIGSETJMP (*buf); \ } \ while (exceptions_state_mc_action_iter ()) \ |