diff options
Diffstat (limited to 'src/ats/test_ats_api_scheduling_add_address_duplicate.c')
-rw-r--r-- | src/ats/test_ats_api_scheduling_add_address_duplicate.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ats/test_ats_api_scheduling_add_address_duplicate.c b/src/ats/test_ats_api_scheduling_add_address_duplicate.c index f2c2b4fd6..6130c0f7e 100644 --- a/src/ats/test_ats_api_scheduling_add_address_duplicate.c +++ b/src/ats/test_ats_api_scheduling_add_address_duplicate.c | |||
@@ -32,9 +32,9 @@ | |||
32 | /** | 32 | /** |
33 | * Timeout task | 33 | * Timeout task |
34 | */ | 34 | */ |
35 | static GNUNET_SCHEDULER_TaskIdentifier die_task; | 35 | static struct GNUNET_SCHEDULER_Task * die_task; |
36 | 36 | ||
37 | static GNUNET_SCHEDULER_TaskIdentifier wait_task; | 37 | static struct GNUNET_SCHEDULER_Task * wait_task; |
38 | 38 | ||
39 | /** | 39 | /** |
40 | * Statistics handle | 40 | * Statistics handle |
@@ -95,13 +95,13 @@ stat_cb(void *cls, const char *subsystem, | |||
95 | subsystem,name, value); | 95 | subsystem,name, value); |
96 | if (1 < value) | 96 | if (1 < value) |
97 | { | 97 | { |
98 | if (GNUNET_SCHEDULER_NO_TASK != wait_task) | 98 | if (NULL != wait_task) |
99 | GNUNET_SCHEDULER_cancel (wait_task); | 99 | GNUNET_SCHEDULER_cancel (wait_task); |
100 | GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 100 | GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
101 | } | 101 | } |
102 | if (1 == value) | 102 | if (1 == value) |
103 | { | 103 | { |
104 | if (GNUNET_SCHEDULER_NO_TASK == wait_task) | 104 | if (NULL == wait_task) |
105 | wait_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL); | 105 | wait_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL); |
106 | } | 106 | } |
107 | return GNUNET_OK; | 107 | return GNUNET_OK; |
@@ -112,12 +112,12 @@ static void | |||
112 | end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 112 | end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
113 | { | 113 | { |
114 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n"); | 114 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n"); |
115 | wait_task = GNUNET_SCHEDULER_NO_TASK; | 115 | wait_task = NULL; |
116 | 116 | ||
117 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 117 | if (die_task != NULL) |
118 | { | 118 | { |
119 | GNUNET_SCHEDULER_cancel (die_task); | 119 | GNUNET_SCHEDULER_cancel (die_task); |
120 | die_task = GNUNET_SCHEDULER_NO_TASK; | 120 | die_task = NULL; |
121 | } | 121 | } |
122 | 122 | ||
123 | if (NULL != sched_ats) | 123 | if (NULL != sched_ats) |
@@ -141,7 +141,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
141 | static void | 141 | static void |
142 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 142 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
143 | { | 143 | { |
144 | die_task = GNUNET_SCHEDULER_NO_TASK; | 144 | die_task = NULL; |
145 | end ( NULL, NULL); | 145 | end ( NULL, NULL); |
146 | ret = GNUNET_SYSERR; | 146 | ret = GNUNET_SYSERR; |
147 | } | 147 | } |