diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-04-05 22:49:05 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-04-08 17:34:10 +0000 |
| commit | 57b2a84f3d900eb0b98157095c6aac07cec54fd9 (patch) | |
| tree | ec069513b90f83bbb31843a17204ffb0fb97fa69 /epan/except.h | |
| parent | 434bbd67a06803ce6bb9a8e0adc6d596246bc458 (diff) | |
Use a single WS_NORETURN macro
Having to define two macros for marking a function as never returning
seems a bit redundant. Merge the MSVC and GCC-like attributes into a
single WS_NORETURN.
Tested with Clang 3.7.1, GCC 4.4.7 and even GCC 4.1.2 using this small
program (-Wall -Wextra, the first two generate warnings for
uninitialized variables, the last one compiles without warnings):
#include <stdlib.h>
__attribute__((noreturn)) void foo() { exit(1); }
__attribute__((noreturn)) void bar();
void bar() { exit(1); }
int main() {
int j, i;
if (i) { bar(); return j; }
foo();
return j;
}
Change-Id: I7d19c15e61b8f8fa4936864407199c4109f8cc82
Reviewed-on: https://code.wireshark.org/review/14822
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/except.h')
| -rw-r--r-- | epan/except.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/except.h b/epan/except.h index 063218274a..0f979637e9 100644 --- a/epan/except.h +++ b/epan/except.h @@ -92,11 +92,11 @@ WS_DLL_PUBLIC struct except_stacknode *except_pop(void); /* public interface functions */ WS_DLL_PUBLIC int except_init(void); WS_DLL_PUBLIC void except_deinit(void); -WS_DLL_PUBLIC WS_MSVC_NORETURN void except_rethrow(except_t *) G_GNUC_NORETURN; -WS_DLL_PUBLIC WS_MSVC_NORETURN void except_throw(long, long, const char *) G_GNUC_NORETURN; -WS_DLL_PUBLIC WS_MSVC_NORETURN void except_throwd(long, long, const char *, void *) G_GNUC_NORETURN; -WS_DLL_PUBLIC WS_MSVC_NORETURN void except_throwf(long, long, const char *, ...) - G_GNUC_NORETURN G_GNUC_PRINTF(3, 4); +WS_DLL_PUBLIC WS_NORETURN void except_rethrow(except_t *); +WS_DLL_PUBLIC WS_NORETURN void except_throw(long, long, const char *); +WS_DLL_PUBLIC WS_NORETURN void except_throwd(long, long, const char *, void *); +WS_DLL_PUBLIC WS_NORETURN void except_throwf(long, long, const char *, ...) + G_GNUC_PRINTF(3, 4); WS_DLL_PUBLIC void (*except_unhandled_catcher(void (*)(except_t *)))(except_t *); extern unsigned long except_code(except_t *); extern unsigned long except_group(except_t *); |