diff options
| author | Gary Benson <gbenson@redhat.com> | 2014-07-23 14:51:26 +0100 |
|---|---|---|
| committer | Gary Benson <gbenson@redhat.com> | 2014-07-24 09:55:50 +0100 |
| commit | 2c51604d3adbcc77a25d78ce900f5be4597c2504 (patch) | |
| tree | 9040f7940bb0e9a8451115c45bb7e185a4a85b5a /gdb/exceptions.h | |
| parent | 342119630e4612856017d03f2892f5a693d85d8e (diff) | |
| download | gdb-2c51604d3adbcc77a25d78ce900f5be4597c2504.zip gdb-2c51604d3adbcc77a25d78ce900f5be4597c2504.tar.gz gdb-2c51604d3adbcc77a25d78ce900f5be4597c2504.tar.bz2 | |
Rationalize "fatal" error handling outside of gdbserver
GDB and gdbserver have functions named "fatal" that are used in
completely different ways. In gdbserver "fatal" is used to handle
critical errors: it differs from "error" in that "fatal" causes
gdbserver to exit whereas "error" does not. In GDB "fatal" is used
to abort the current operation and return to the command level.
This is implemented by throwing a non-error "RETURN_QUIT" exception.
This commit removes GDB's "fatal" and "vfatal" functions entirely.
The exception-throwing function "throw_vfatal" is renamed as
"throw_vquit", and a new convenience function "throw_quit" is added.
The small number of calls to "fatal" are replaced with calls to
"throw_quit", making what is happening more obvious.
This commit also modifies GDB's "throw_error" to call "throw_verror"
rather than calling "throw_it" directly. This change means the
assignment of RETURN_ERROR as the exception type now happens in
precisely one place in GDB rather than two.
gdb/
2014-07-24 Gary Benson <gbenson@redhat.com>
* exceptions.h (throw_vfatal): Renamed to...
(throw_vquit): New declaration.
(throw_quit): Likewise.
* exceptions.c (throw_vfatal): Renamed to...
(throw_vquit): New function.
(throw_quit): Likewise.
(throw_error): Call throw_verror rather than throw_it.
* utils.h (vfatal): Removed.
(fatal): Likewise.
* utils.c (vfatal): Removed.
(fatal): Likewise.
(internal_verror): Replaced call to fatal with call to throw_quit.
(quit): Replaced calls to fatal with calls to throw_quit.
Diffstat (limited to 'gdb/exceptions.h')
| -rw-r--r-- | gdb/exceptions.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gdb/exceptions.h b/gdb/exceptions.h index e5e1a49..be74ad5 100644 --- a/gdb/exceptions.h +++ b/gdb/exceptions.h @@ -191,10 +191,12 @@ extern void throw_exception (struct gdb_exception exception) ATTRIBUTE_NORETURN; extern void throw_verror (enum errors, const char *fmt, va_list ap) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (2, 0); -extern void throw_vfatal (const char *fmt, va_list ap) +extern void throw_vquit (const char *fmt, va_list ap) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 0); extern void throw_error (enum errors error, const char *fmt, ...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (2, 3); +extern void throw_quit (const char *fmt, ...) + ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2); /* Call FUNC(UIOUT, FUNC_ARGS) but wrapped within an exception handler. If an exception (enum return_reason) is thrown using |