aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api_2peers_1controller.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/test_testbed_api_2peers_1controller.c')
-rw-r--r--src/testbed/test_testbed_api_2peers_1controller.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c
index 0bee03de9..1e15d07aa 100644
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -186,10 +186,9 @@ static enum Stage result;
186 * Shutdown nicely 186 * Shutdown nicely
187 * 187 *
188 * @param cls NULL 188 * @param cls NULL
189 * @param tc the task context
190 */ 189 */
191static void 190static void
192do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 191do_shutdown (void *cls)
193{ 192{
194 if (NULL != abort_task) 193 if (NULL != abort_task)
195 GNUNET_SCHEDULER_cancel (abort_task); 194 GNUNET_SCHEDULER_cancel (abort_task);
@@ -210,14 +209,13 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
210 * abort task to run on test timed out 209 * abort task to run on test timed out
211 * 210 *
212 * @param cls NULL 211 * @param cls NULL
213 * @param tc the task context
214 */ 212 */
215static void 213static void
216do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 214do_abort (void *cls)
217{ 215{
218 LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); 216 LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
219 abort_task = NULL; 217 abort_task = NULL;
220 do_shutdown (cls, tc); 218 do_shutdown (cls);
221} 219}
222 220
223 221
@@ -237,10 +235,9 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg);
237 * task for delaying a connect 235 * task for delaying a connect
238 * 236 *
239 * @param cls NULL 237 * @param cls NULL
240 * @param tc the task context
241 */ 238 */
242static void 239static void
243do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 240do_delayed_connect (void *cls)
244{ 241{
245 delayed_connect_task = NULL; 242 delayed_connect_task = NULL;
246 FAIL_TEST (NULL == common_operation); 243 FAIL_TEST (NULL == common_operation);