diff options
Diffstat (limited to 'src/testbed/test_testbed_api_test.c')
-rw-r--r-- | src/testbed/test_testbed_api_test.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index 80e92eb90..61d3f2aba 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c | |||
@@ -70,10 +70,9 @@ static int result; | |||
70 | * Shutdown nicely | 70 | * Shutdown nicely |
71 | * | 71 | * |
72 | * @param cls NULL | 72 | * @param cls NULL |
73 | * @param tc the task context | ||
74 | */ | 73 | */ |
75 | static void | 74 | static void |
76 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 75 | do_shutdown (void *cls) |
77 | { | 76 | { |
78 | shutdown_task = NULL; | 77 | shutdown_task = NULL; |
79 | if (NULL != abort_task) | 78 | if (NULL != abort_task) |
@@ -93,7 +92,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
93 | GNUNET_SCHEDULER_cancel (abort_task); \ | 92 | GNUNET_SCHEDULER_cancel (abort_task); \ |
94 | abort_task = NULL; \ | 93 | abort_task = NULL; \ |
95 | if (NULL == shutdown_task) \ | 94 | if (NULL == shutdown_task) \ |
96 | shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ | 95 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); \ |
97 | return; \ | 96 | return; \ |
98 | } \ | 97 | } \ |
99 | } while (0) | 98 | } while (0) |
@@ -103,16 +102,15 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
103 | * abort task to run on test timed out | 102 | * abort task to run on test timed out |
104 | * | 103 | * |
105 | * @param cls NULL | 104 | * @param cls NULL |
106 | * @param tc the task context | ||
107 | */ | 105 | */ |
108 | static void | 106 | static void |
109 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 107 | do_abort (void *cls) |
110 | { | 108 | { |
111 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 109 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
112 | abort_task = NULL; | 110 | abort_task = NULL; |
113 | if (NULL != shutdown_task) | 111 | if (NULL != shutdown_task) |
114 | GNUNET_SCHEDULER_cancel (shutdown_task); | 112 | GNUNET_SCHEDULER_cancel (shutdown_task); |
115 | do_shutdown (cls, tc); | 113 | do_shutdown (cls); |
116 | } | 114 | } |
117 | 115 | ||
118 | 116 | ||