Fixed invalid setjmp usage

Snaipe · Sep 18, 2015 · f8e2054 · f8e2054
1 parent bf51b3a
commit f8e2054
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/core/abort.c b/src/core/abort.c
@@ -25,10 +25,6 @@
 
 jmp_buf g_pre_test;
 
-int setup_abort_test(void) {
-    return !setjmp(g_pre_test);
-}
-
 void criterion_abort_test(void) {
     longjmp(g_pre_test, 1);
 }
diff --git a/src/core/abort.h b/src/core/abort.h
@@ -29,6 +29,4 @@
 
 extern jmp_buf g_pre_test;
 
-int setup_abort_test(void);
-
 #endif /* !ABORT_H_ */
diff --git a/src/core/runner.c b/src/core/runner.c
@@ -59,7 +59,6 @@ TestSuite();
 Test(,) {};
 
 static INLINE void nothing(void) {}
-static INLINE void nothing_ptr(UNUSED void* ptr) {}
 
 int cmp_suite(void *a, void *b) {
     struct criterion_suite *s1 = a, *s2 = b;
@@ -185,13 +184,16 @@ static void run_test_child(struct criterion_test *test,
     send_event(PRE_TEST, NULL, 0);
 
     struct timespec_compat ts;
-    if (setup_abort_test()) {
+    if (!setjmp(g_pre_test)) {
         timer_start(&ts);
-        if (!test->data->param_)
-            (test->test ? test->test : nothing)();
-        else
-            (test->test ? (void(*)(void*)) test->test
-                        : nothing_ptr)(g_worker_context.param->ptr);
+        if (test->test) {
+            if (!test->data->param_) {
+                test->test();
+            } else {
+                void(*param_test_func)(void *) = (void(*)(void*)) test->test;
+                param_test_func(g_worker_context.param->ptr);
+            }
+        }
     }
 
     double elapsed_time;