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 /dumpcap.c | |
parent | 434bbd67a06803ce6bb9a8e0adc6d596246bc458 (diff) | |
download | wireshark-57b2a84f3d900eb0b98157095c6aac07cec54fd9.tar.gz |
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 'dumpcap.c')
-rw-r--r-- | dumpcap.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -394,7 +394,7 @@ static void capture_loop_queue_packet_cb(u_char *pcap_opts_p, const struct pcap_ static void capture_loop_get_errmsg(char *errmsg, int errmsglen, const char *fname, int err, gboolean is_close); -static void WS_MSVC_NORETURN exit_main(int err) G_GNUC_NORETURN; +static void WS_NORETURN exit_main(int err); static void report_new_capture_file(const char *filename); static void report_packet_count(unsigned int packet_count); |