Merge pull request #408 from qlyoung/remove-thread-macros

*: remove THREAD_ON macros, add nullity check

1 files changed, 7 insertions, 4 deletions

diff --git a/tests/lib/test_timer_performance.c b/tests/lib/test_timer_performance.c
index a7d09beecc..da0355f660 100644
--- a/tests/lib/test_timer_performance.c
+++ b/tests/lib/test_timer_performance.c
@@ -56,8 +56,10 @@ int main(int argc, char **argv)
 
   /* create thread structures so they won't be allocated during the
    * time measurement */
-  for (i = 0; i < SCHEDULE_TIMERS; i++)
-    timers[i] = thread_add_timer_msec(master, dummy_func, NULL, 0);
+  for (i = 0; i < SCHEDULE_TIMERS; i++) {
+    timers[i] = NULL;
+    thread_add_timer_msec(master, dummy_func, NULL, 0, &timers[i]);
+  }
   for (i = 0; i < SCHEDULE_TIMERS; i++)
     thread_cancel(timers[i]);
 
@@ -68,8 +70,9 @@ int main(int argc, char **argv)
       long interval_msec;
 
       interval_msec = prng_rand(prng) % (100 * SCHEDULE_TIMERS);
-      timers[i] = thread_add_timer_msec(master, dummy_func,
-                                        NULL, interval_msec);
+      timers[i] = NULL;
+      thread_add_timer_msec(master, dummy_func, NULL, interval_msec,
+                            &timers[i]);
     }
 
   monotime(&tv_lap);