aboutsummaryrefslogtreecommitdiffstats
path: root/epan/exntest.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-02-24 19:34:37 +0000
committerGuy Harris <guy@alum.mit.edu>2015-02-24 19:34:50 +0000
commitced6fbaae4a09ed2fd74cd6669118637fea78055 (patch)
treea6d5baf24242cc9e43e90f6948c733e5fb8e759a /epan/exntest.c
parentc280a40443100293585f3ee5656fc620e2ce8483 (diff)
Revert "exntest: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang"
This reverts commit f9fc25241ca0c735c0945bebf04669f17c3ffbff. Apparently, clang is wrong about those increments being dead, as the tests done by exntest fail as a result of this change. Perhaps it doesn't understand setjmp/longjmp. Change-Id: I248fba972e52bcbc97a228777139ca22a835f4b6 Reviewed-on: https://code.wireshark.org/review/7347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/exntest.c')
-rw-r--r--epan/exntest.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/exntest.c b/epan/exntest.c
index 27f6f65966..ff9c88ec14 100644
--- a/epan/exntest.c
+++ b/epan/exntest.c
@@ -70,7 +70,7 @@ run_tests(void)
/* check that no catch at all is called when there is no exn */
- finally_called = 0;
+ ex_thrown = finally_called = 0;
TRY {
}
CATCH(BoundsError) {
@@ -133,6 +133,7 @@ run_tests(void)
THROW(BoundsError);
}
CATCH_ALL {
+ ex_thrown += 10;
RETHROW;
}
FINALLY {
@@ -170,6 +171,7 @@ run_tests(void)
printf("05: Looping exception\n");
failed = TRUE;
} else {
+ ex_thrown += 10;
THROW(BoundsError);
}
}