diff options
Diffstat (limited to 'src/testbed/test_testbed_api_3peers_3controllers.c')
-rw-r--r-- | src/testbed/test_testbed_api_3peers_3controllers.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index 5919cbefa..a728048f3 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c | |||
@@ -254,10 +254,9 @@ static enum Stage result; | |||
254 | * Shutdown nicely | 254 | * Shutdown nicely |
255 | * | 255 | * |
256 | * @param cls NULL | 256 | * @param cls NULL |
257 | * @param tc the task context | ||
258 | */ | 257 | */ |
259 | static void | 258 | static void |
260 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 259 | do_shutdown (void *cls) |
261 | { | 260 | { |
262 | if (NULL != abort_task) | 261 | if (NULL != abort_task) |
263 | GNUNET_SCHEDULER_cancel (abort_task); | 262 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -288,10 +287,9 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
288 | * abort task to run on test timed out | 287 | * abort task to run on test timed out |
289 | * | 288 | * |
290 | * @param cls NULL | 289 | * @param cls NULL |
291 | * @param tc the task context | ||
292 | */ | 290 | */ |
293 | static void | 291 | static void |
294 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 292 | do_abort (void *cls) |
295 | { | 293 | { |
296 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 294 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
297 | abort_task = NULL; | 295 | abort_task = NULL; |
@@ -300,7 +298,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
300 | GNUNET_SCHEDULER_cancel (delayed_connect_task); | 298 | GNUNET_SCHEDULER_cancel (delayed_connect_task); |
301 | delayed_connect_task = NULL; | 299 | delayed_connect_task = NULL; |
302 | } | 300 | } |
303 | do_shutdown (cls, tc); | 301 | do_shutdown (cls); |
304 | } | 302 | } |
305 | 303 | ||
306 | static void | 304 | static void |
@@ -328,10 +326,9 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg); | |||
328 | * task for delaying a connect | 326 | * task for delaying a connect |
329 | * | 327 | * |
330 | * @param cls NULL | 328 | * @param cls NULL |
331 | * @param tc the task context | ||
332 | */ | 329 | */ |
333 | static void | 330 | static void |
334 | do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 331 | do_delayed_connect (void *cls) |
335 | { | 332 | { |
336 | delayed_connect_task = NULL; | 333 | delayed_connect_task = NULL; |
337 | if (NULL != common_operation) | 334 | if (NULL != common_operation) |