diff options
Diffstat (limited to 'src/testbed/test_testbed_api_peer_reconfiguration.c')
-rw-r--r-- | src/testbed/test_testbed_api_peer_reconfiguration.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 6b5f3e117..3928274de 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c | |||
@@ -47,7 +47,7 @@ static struct GNUNET_TESTBED_Operation *op; | |||
47 | /** | 47 | /** |
48 | * Abort task identifier | 48 | * Abort task identifier |
49 | */ | 49 | */ |
50 | static GNUNET_SCHEDULER_TaskIdentifier abort_task; | 50 | static struct GNUNET_SCHEDULER_Task * abort_task; |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * States in this test | 53 | * States in this test |
@@ -77,7 +77,7 @@ enum { | |||
77 | #define FAIL_TEST(cond, ret) do { \ | 77 | #define FAIL_TEST(cond, ret) do { \ |
78 | if (!(cond)) { \ | 78 | if (!(cond)) { \ |
79 | GNUNET_break(0); \ | 79 | GNUNET_break(0); \ |
80 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) \ | 80 | if (NULL != abort_task) \ |
81 | GNUNET_SCHEDULER_cancel (abort_task); \ | 81 | GNUNET_SCHEDULER_cancel (abort_task); \ |
82 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ | 82 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ |
83 | ret; \ | 83 | ret; \ |
@@ -95,7 +95,7 @@ static void | |||
95 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 95 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
96 | { | 96 | { |
97 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); | 97 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); |
98 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 98 | abort_task = NULL; |
99 | if (NULL != op) | 99 | if (NULL != op) |
100 | { | 100 | { |
101 | GNUNET_TESTBED_operation_done (op); | 101 | GNUNET_TESTBED_operation_done (op); |
@@ -134,7 +134,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
134 | GNUNET_TESTBED_operation_done (op); | 134 | GNUNET_TESTBED_operation_done (op); |
135 | state = STATE_PEER_RECONFIGURED; | 135 | state = STATE_PEER_RECONFIGURED; |
136 | GNUNET_SCHEDULER_cancel (abort_task); | 136 | GNUNET_SCHEDULER_cancel (abort_task); |
137 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 137 | abort_task = NULL; |
138 | GNUNET_SCHEDULER_shutdown (); | 138 | GNUNET_SCHEDULER_shutdown (); |
139 | } | 139 | } |
140 | 140 | ||