diff options
Diffstat (limited to 'src/namestore')
19 files changed, 86 insertions, 86 deletions
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 5286b9056..c82977b28 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c | |||
@@ -194,7 +194,7 @@ static struct MHD_Daemon *httpd; | |||
194 | /** | 194 | /** |
195 | * Main HTTP task. | 195 | * Main HTTP task. |
196 | */ | 196 | */ |
197 | static GNUNET_SCHEDULER_TaskIdentifier httpd_task; | 197 | static struct GNUNET_SCHEDULER_Task * httpd_task; |
198 | 198 | ||
199 | /** | 199 | /** |
200 | * Handle to the namestore. | 200 | * Handle to the namestore. |
@@ -239,10 +239,10 @@ do_httpd (void *cls, | |||
239 | static void | 239 | static void |
240 | run_httpd_now () | 240 | run_httpd_now () |
241 | { | 241 | { |
242 | if (GNUNET_SCHEDULER_NO_TASK != httpd_task) | 242 | if (NULL != httpd_task) |
243 | { | 243 | { |
244 | GNUNET_SCHEDULER_cancel (httpd_task); | 244 | GNUNET_SCHEDULER_cancel (httpd_task); |
245 | httpd_task = GNUNET_SCHEDULER_NO_TASK; | 245 | httpd_task = NULL; |
246 | } | 246 | } |
247 | httpd_task = GNUNET_SCHEDULER_add_now (&do_httpd, NULL); | 247 | httpd_task = GNUNET_SCHEDULER_add_now (&do_httpd, NULL); |
248 | } | 248 | } |
@@ -846,7 +846,7 @@ static void | |||
846 | do_httpd (void *cls, | 846 | do_httpd (void *cls, |
847 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 847 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
848 | { | 848 | { |
849 | httpd_task = GNUNET_SCHEDULER_NO_TASK; | 849 | httpd_task = NULL; |
850 | MHD_run (httpd); | 850 | MHD_run (httpd); |
851 | run_httpd (); | 851 | run_httpd (); |
852 | } | 852 | } |
@@ -862,10 +862,10 @@ static void | |||
862 | do_shutdown (void *cls, | 862 | do_shutdown (void *cls, |
863 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 863 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
864 | { | 864 | { |
865 | if (GNUNET_SCHEDULER_NO_TASK != httpd_task) | 865 | if (NULL != httpd_task) |
866 | { | 866 | { |
867 | GNUNET_SCHEDULER_cancel (httpd_task); | 867 | GNUNET_SCHEDULER_cancel (httpd_task); |
868 | httpd_task = GNUNET_SCHEDULER_NO_TASK; | 868 | httpd_task = NULL; |
869 | } | 869 | } |
870 | if (NULL != ns) | 870 | if (NULL != ns) |
871 | { | 871 | { |
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index 1f4226297..9716a73b6 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -152,7 +152,7 @@ struct ZoneMonitor | |||
152 | /** | 152 | /** |
153 | * Task active during initial iteration. | 153 | * Task active during initial iteration. |
154 | */ | 154 | */ |
155 | GNUNET_SCHEDULER_TaskIdentifier task; | 155 | struct GNUNET_SCHEDULER_Task * task; |
156 | 156 | ||
157 | /** | 157 | /** |
158 | * Offset of the zone iteration used to address next result of the zone | 158 | * Offset of the zone iteration used to address next result of the zone |
@@ -355,10 +355,10 @@ client_disconnect_notification (void *cls, | |||
355 | GNUNET_CONTAINER_DLL_remove (monitor_head, | 355 | GNUNET_CONTAINER_DLL_remove (monitor_head, |
356 | monitor_tail, | 356 | monitor_tail, |
357 | zm); | 357 | zm); |
358 | if (GNUNET_SCHEDULER_NO_TASK != zm->task) | 358 | if (NULL != zm->task) |
359 | { | 359 | { |
360 | GNUNET_SCHEDULER_cancel (zm->task); | 360 | GNUNET_SCHEDULER_cancel (zm->task); |
361 | zm->task = GNUNET_SCHEDULER_NO_TASK; | 361 | zm->task = NULL; |
362 | } | 362 | } |
363 | GNUNET_free (zm); | 363 | GNUNET_free (zm); |
364 | break; | 364 | break; |
@@ -1614,7 +1614,7 @@ monitor_next (void *cls, | |||
1614 | struct ZoneMonitor *zm = cls; | 1614 | struct ZoneMonitor *zm = cls; |
1615 | int ret; | 1615 | int ret; |
1616 | 1616 | ||
1617 | zm->task = GNUNET_SCHEDULER_NO_TASK; | 1617 | zm->task = NULL; |
1618 | ret = GSN_database->iterate_records (GSN_database->cls, | 1618 | ret = GSN_database->iterate_records (GSN_database->cls, |
1619 | (0 == memcmp (&zm->zone, &zero, sizeof (zero))) | 1619 | (0 == memcmp (&zm->zone, &zero, sizeof (zero))) |
1620 | ? NULL | 1620 | ? NULL |
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index c089929a6..eca65f116 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c | |||
@@ -214,7 +214,7 @@ struct GNUNET_NAMESTORE_Handle | |||
214 | /** | 214 | /** |
215 | * Reconnect task | 215 | * Reconnect task |
216 | */ | 216 | */ |
217 | GNUNET_SCHEDULER_TaskIdentifier reconnect_task; | 217 | struct GNUNET_SCHEDULER_Task * reconnect_task; |
218 | 218 | ||
219 | /** | 219 | /** |
220 | * Delay introduced before we reconnect. | 220 | * Delay introduced before we reconnect. |
@@ -874,7 +874,7 @@ reconnect_task (void *cls, | |||
874 | { | 874 | { |
875 | struct GNUNET_NAMESTORE_Handle *h = cls; | 875 | struct GNUNET_NAMESTORE_Handle *h = cls; |
876 | 876 | ||
877 | h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; | 877 | h->reconnect_task = NULL; |
878 | reconnect (h); | 878 | reconnect (h); |
879 | } | 879 | } |
880 | 880 | ||
@@ -979,10 +979,10 @@ GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h) | |||
979 | GNUNET_CLIENT_disconnect (h->client); | 979 | GNUNET_CLIENT_disconnect (h->client); |
980 | h->client = NULL; | 980 | h->client = NULL; |
981 | } | 981 | } |
982 | if (GNUNET_SCHEDULER_NO_TASK != h->reconnect_task) | 982 | if (NULL != h->reconnect_task) |
983 | { | 983 | { |
984 | GNUNET_SCHEDULER_cancel (h->reconnect_task); | 984 | GNUNET_SCHEDULER_cancel (h->reconnect_task); |
985 | h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; | 985 | h->reconnect_task = NULL; |
986 | } | 986 | } |
987 | GNUNET_free (h); | 987 | GNUNET_free (h); |
988 | } | 988 | } |
diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c index 2a3933e79..1f7647ca5 100644 --- a/src/namestore/test_namestore_api_lookup_nick.c +++ b/src/namestore/test_namestore_api_lookup_nick.c | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | static struct GNUNET_NAMESTORE_Handle *nsh; | 38 | static struct GNUNET_NAMESTORE_Handle *nsh; |
39 | 39 | ||
40 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 40 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
41 | 41 | ||
42 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 42 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
43 | 43 | ||
@@ -206,14 +206,14 @@ void lookup_it (void *cls, | |||
206 | if ((GNUNET_YES == found_nick) && (GNUNET_YES == found_record)) | 206 | if ((GNUNET_YES == found_nick) && (GNUNET_YES == found_record)) |
207 | { | 207 | { |
208 | GNUNET_SCHEDULER_cancel (endbadly_task); | 208 | GNUNET_SCHEDULER_cancel (endbadly_task); |
209 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 209 | endbadly_task = NULL; |
210 | GNUNET_SCHEDULER_add_now (&end, NULL ); | 210 | GNUNET_SCHEDULER_add_now (&end, NULL ); |
211 | } | 211 | } |
212 | else | 212 | else |
213 | { | 213 | { |
214 | GNUNET_break (0); | 214 | GNUNET_break (0); |
215 | GNUNET_SCHEDULER_cancel (endbadly_task); | 215 | GNUNET_SCHEDULER_cancel (endbadly_task); |
216 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 216 | endbadly_task = NULL; |
217 | GNUNET_SCHEDULER_add_now (&endbadly, NULL ); | 217 | GNUNET_SCHEDULER_add_now (&endbadly, NULL ); |
218 | } | 218 | } |
219 | } | 219 | } |
diff --git a/src/namestore/test_namestore_api_lookup_private.c b/src/namestore/test_namestore_api_lookup_private.c index 87b580bb9..51ec5f4a1 100644 --- a/src/namestore/test_namestore_api_lookup_private.c +++ b/src/namestore/test_namestore_api_lookup_private.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | static struct GNUNET_NAMESTORE_Handle *nsh; | 36 | static struct GNUNET_NAMESTORE_Handle *nsh; |
37 | 37 | ||
38 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 38 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
39 | 39 | ||
40 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 40 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
41 | 41 | ||
@@ -136,7 +136,7 @@ void lookup_it (void *cls, | |||
136 | 136 | ||
137 | /* Done */ | 137 | /* Done */ |
138 | GNUNET_SCHEDULER_cancel (endbadly_task); | 138 | GNUNET_SCHEDULER_cancel (endbadly_task); |
139 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 139 | endbadly_task = NULL; |
140 | GNUNET_SCHEDULER_add_now (&end, NULL ); | 140 | GNUNET_SCHEDULER_add_now (&end, NULL ); |
141 | } | 141 | } |
142 | 142 | ||
diff --git a/src/namestore/test_namestore_api_lookup_public.c b/src/namestore/test_namestore_api_lookup_public.c index df54f906c..7d4c2e69d 100644 --- a/src/namestore/test_namestore_api_lookup_public.c +++ b/src/namestore/test_namestore_api_lookup_public.c | |||
@@ -39,7 +39,7 @@ static struct GNUNET_NAMESTORE_Handle *nsh; | |||
39 | 39 | ||
40 | static struct GNUNET_NAMECACHE_Handle *nch; | 40 | static struct GNUNET_NAMECACHE_Handle *nch; |
41 | 41 | ||
42 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 42 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
43 | 43 | ||
44 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 44 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
45 | 45 | ||
@@ -139,17 +139,17 @@ name_lookup_proc (void *cls, | |||
139 | ncqe = NULL; | 139 | ncqe = NULL; |
140 | GNUNET_assert (NULL != cls); | 140 | GNUNET_assert (NULL != cls); |
141 | 141 | ||
142 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 142 | if (endbadly_task != NULL) |
143 | { | 143 | { |
144 | GNUNET_SCHEDULER_cancel (endbadly_task); | 144 | GNUNET_SCHEDULER_cancel (endbadly_task); |
145 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 145 | endbadly_task = NULL; |
146 | } | 146 | } |
147 | 147 | ||
148 | if (NULL == block) | 148 | if (NULL == block) |
149 | { | 149 | { |
150 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 150 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
151 | _("Namestore returned no block\n")); | 151 | _("Namestore returned no block\n")); |
152 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 152 | if (endbadly_task != NULL) |
153 | GNUNET_SCHEDULER_cancel (endbadly_task); | 153 | GNUNET_SCHEDULER_cancel (endbadly_task); |
154 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 154 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
155 | return; | 155 | return; |
diff --git a/src/namestore/test_namestore_api_lookup_shadow.c b/src/namestore/test_namestore_api_lookup_shadow.c index e423dbb3e..373aa116d 100644 --- a/src/namestore/test_namestore_api_lookup_shadow.c +++ b/src/namestore/test_namestore_api_lookup_shadow.c | |||
@@ -41,7 +41,7 @@ static struct GNUNET_NAMESTORE_Handle *nsh; | |||
41 | 41 | ||
42 | static struct GNUNET_NAMECACHE_Handle *nch; | 42 | static struct GNUNET_NAMECACHE_Handle *nch; |
43 | 43 | ||
44 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 44 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
45 | 45 | ||
46 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 46 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
47 | 47 | ||
@@ -171,17 +171,17 @@ name_lookup_proc (void *cls, | |||
171 | ncqe = NULL; | 171 | ncqe = NULL; |
172 | GNUNET_assert (NULL != cls); | 172 | GNUNET_assert (NULL != cls); |
173 | 173 | ||
174 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 174 | if (endbadly_task != NULL) |
175 | { | 175 | { |
176 | GNUNET_SCHEDULER_cancel (endbadly_task); | 176 | GNUNET_SCHEDULER_cancel (endbadly_task); |
177 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 177 | endbadly_task = NULL; |
178 | } | 178 | } |
179 | 179 | ||
180 | if (NULL == block) | 180 | if (NULL == block) |
181 | { | 181 | { |
182 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 182 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
183 | _("Namestore returned no block\n")); | 183 | _("Namestore returned no block\n")); |
184 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 184 | if (endbadly_task != NULL) |
185 | GNUNET_SCHEDULER_cancel (endbadly_task); | 185 | GNUNET_SCHEDULER_cancel (endbadly_task); |
186 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 186 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
187 | return; | 187 | return; |
diff --git a/src/namestore/test_namestore_api_lookup_shadow_filter.c b/src/namestore/test_namestore_api_lookup_shadow_filter.c index 825c4d0a4..9a18d84b7 100644 --- a/src/namestore/test_namestore_api_lookup_shadow_filter.c +++ b/src/namestore/test_namestore_api_lookup_shadow_filter.c | |||
@@ -42,9 +42,9 @@ static struct GNUNET_NAMESTORE_Handle *nsh; | |||
42 | 42 | ||
43 | static struct GNUNET_NAMECACHE_Handle *nch; | 43 | static struct GNUNET_NAMECACHE_Handle *nch; |
44 | 44 | ||
45 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 45 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
46 | 46 | ||
47 | static GNUNET_SCHEDULER_TaskIdentifier delayed_lookup_task; | 47 | static struct GNUNET_SCHEDULER_Task * delayed_lookup_task; |
48 | 48 | ||
49 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 49 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
50 | 50 | ||
@@ -99,10 +99,10 @@ cleanup () | |||
99 | static void | 99 | static void |
100 | endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 100 | endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
101 | { | 101 | { |
102 | if (GNUNET_SCHEDULER_NO_TASK != delayed_lookup_task) | 102 | if (NULL != delayed_lookup_task) |
103 | { | 103 | { |
104 | GNUNET_SCHEDULER_cancel (delayed_lookup_task); | 104 | GNUNET_SCHEDULER_cancel (delayed_lookup_task); |
105 | delayed_lookup_task = GNUNET_SCHEDULER_NO_TASK; | 105 | delayed_lookup_task = NULL; |
106 | } | 106 | } |
107 | if (NULL != nsqe) | 107 | if (NULL != nsqe) |
108 | { | 108 | { |
@@ -222,17 +222,17 @@ name_lookup_active_proc (void *cls, | |||
222 | 222 | ||
223 | ncqe = NULL; | 223 | ncqe = NULL; |
224 | ncqe_shadow = NULL; | 224 | ncqe_shadow = NULL; |
225 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 225 | if (endbadly_task != NULL) |
226 | { | 226 | { |
227 | GNUNET_SCHEDULER_cancel (endbadly_task); | 227 | GNUNET_SCHEDULER_cancel (endbadly_task); |
228 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 228 | endbadly_task = NULL; |
229 | } | 229 | } |
230 | 230 | ||
231 | if (NULL == block) | 231 | if (NULL == block) |
232 | { | 232 | { |
233 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 233 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
234 | _("Namestore returned no block\n")); | 234 | _("Namestore returned no block\n")); |
235 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 235 | if (endbadly_task != NULL) |
236 | GNUNET_SCHEDULER_cancel (endbadly_task); | 236 | GNUNET_SCHEDULER_cancel (endbadly_task); |
237 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 237 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
238 | return; | 238 | return; |
@@ -249,7 +249,7 @@ name_lookup_shadow (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
249 | { | 249 | { |
250 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 250 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
251 | "Performing lookup for shadow record \n"); | 251 | "Performing lookup for shadow record \n"); |
252 | delayed_lookup_task = GNUNET_SCHEDULER_NO_TASK; | 252 | delayed_lookup_task = NULL; |
253 | ncqe_shadow = GNUNET_NAMECACHE_lookup_block (nch, &derived_hash, | 253 | ncqe_shadow = GNUNET_NAMECACHE_lookup_block (nch, &derived_hash, |
254 | &name_lookup_active_proc, &records[1]); | 254 | &name_lookup_active_proc, &records[1]); |
255 | } | 255 | } |
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c index f7eb5fd89..0477f23de 100644 --- a/src/namestore/test_namestore_api_monitoring.c +++ b/src/namestore/test_namestore_api_monitoring.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | static struct GNUNET_NAMESTORE_Handle * nsh; | 33 | static struct GNUNET_NAMESTORE_Handle * nsh; |
34 | 34 | ||
35 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 35 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
36 | 36 | ||
37 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; | 37 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
38 | 38 | ||
@@ -196,10 +196,10 @@ zone_proc (void *cls, | |||
196 | 196 | ||
197 | if (2 == ++returned_records) | 197 | if (2 == ++returned_records) |
198 | { | 198 | { |
199 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 199 | if (endbadly_task != NULL) |
200 | { | 200 | { |
201 | GNUNET_SCHEDULER_cancel (endbadly_task); | 201 | GNUNET_SCHEDULER_cancel (endbadly_task); |
202 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 202 | endbadly_task = NULL; |
203 | } | 203 | } |
204 | if (GNUNET_YES == fail) | 204 | if (GNUNET_YES == fail) |
205 | GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 205 | GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c index ae922d30e..a02860c86 100644 --- a/src/namestore/test_namestore_api_monitoring_existing.c +++ b/src/namestore/test_namestore_api_monitoring_existing.c | |||
@@ -33,7 +33,7 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg; | |||
33 | 33 | ||
34 | static struct GNUNET_NAMESTORE_Handle * nsh; | 34 | static struct GNUNET_NAMESTORE_Handle * nsh; |
35 | 35 | ||
36 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 36 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
37 | 37 | ||
38 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; | 38 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
39 | 39 | ||
@@ -194,10 +194,10 @@ zone_proc (void *cls, | |||
194 | 194 | ||
195 | if (2 == ++returned_records) | 195 | if (2 == ++returned_records) |
196 | { | 196 | { |
197 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 197 | if (endbadly_task != NULL) |
198 | { | 198 | { |
199 | GNUNET_SCHEDULER_cancel (endbadly_task); | 199 | GNUNET_SCHEDULER_cancel (endbadly_task); |
200 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 200 | endbadly_task = NULL; |
201 | } | 201 | } |
202 | if (GNUNET_YES == fail) | 202 | if (GNUNET_YES == fail) |
203 | GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 203 | GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index a6b4731d2..771c90042 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | static struct GNUNET_NAMESTORE_Handle *nsh; | 37 | static struct GNUNET_NAMESTORE_Handle *nsh; |
38 | 38 | ||
39 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 39 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
40 | 40 | ||
41 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 41 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
42 | 42 | ||
@@ -103,7 +103,7 @@ remove_cont (void *cls, | |||
103 | { | 103 | { |
104 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 104 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
105 | _("Records could not be removed: `%s'\n"), emsg); | 105 | _("Records could not be removed: `%s'\n"), emsg); |
106 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 106 | if (endbadly_task != NULL) |
107 | GNUNET_SCHEDULER_cancel (endbadly_task); | 107 | GNUNET_SCHEDULER_cancel (endbadly_task); |
108 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 108 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
109 | return; | 109 | return; |
@@ -111,7 +111,7 @@ remove_cont (void *cls, | |||
111 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 111 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
112 | "Records were removed, perform lookup\n"); | 112 | "Records were removed, perform lookup\n"); |
113 | removed = GNUNET_YES; | 113 | removed = GNUNET_YES; |
114 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 114 | if (endbadly_task != NULL) |
115 | GNUNET_SCHEDULER_cancel (endbadly_task); | 115 | GNUNET_SCHEDULER_cancel (endbadly_task); |
116 | GNUNET_SCHEDULER_add_now (&end, NULL); | 116 | GNUNET_SCHEDULER_add_now (&end, NULL); |
117 | } | 117 | } |
@@ -130,7 +130,7 @@ put_cont (void *cls, int32_t success, | |||
130 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 130 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
131 | "Namestore could not store record: `%s'\n", | 131 | "Namestore could not store record: `%s'\n", |
132 | emsg); | 132 | emsg); |
133 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 133 | if (endbadly_task != NULL) |
134 | GNUNET_SCHEDULER_cancel (endbadly_task); | 134 | GNUNET_SCHEDULER_cancel (endbadly_task); |
135 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 135 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
136 | return; | 136 | return; |
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index b87aec6a9..9e08efa1b 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | static struct GNUNET_NAMESTORE_Handle *nsh; | 37 | static struct GNUNET_NAMESTORE_Handle *nsh; |
38 | 38 | ||
39 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 39 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
40 | 40 | ||
41 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 41 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
42 | 42 | ||
@@ -98,10 +98,10 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
98 | { | 98 | { |
99 | GNUNET_assert (NULL != cls); | 99 | GNUNET_assert (NULL != cls); |
100 | nsqe = NULL; | 100 | nsqe = NULL; |
101 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 101 | if (endbadly_task != NULL) |
102 | { | 102 | { |
103 | GNUNET_SCHEDULER_cancel (endbadly_task); | 103 | GNUNET_SCHEDULER_cancel (endbadly_task); |
104 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 104 | endbadly_task = NULL; |
105 | } | 105 | } |
106 | 106 | ||
107 | switch (success) { | 107 | switch (success) { |
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c index 5fd0e9b81..2eea1b0bd 100644 --- a/src/namestore/test_namestore_api_store.c +++ b/src/namestore/test_namestore_api_store.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | static struct GNUNET_NAMESTORE_Handle *nsh; | 37 | static struct GNUNET_NAMESTORE_Handle *nsh; |
38 | 38 | ||
39 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 39 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
40 | 40 | ||
41 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 41 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
42 | 42 | ||
@@ -104,7 +104,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
104 | name, | 104 | name, |
105 | (success == GNUNET_OK) ? "SUCCESS" : "FAIL"); | 105 | (success == GNUNET_OK) ? "SUCCESS" : "FAIL"); |
106 | GNUNET_SCHEDULER_cancel (endbadly_task); | 106 | GNUNET_SCHEDULER_cancel (endbadly_task); |
107 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 107 | endbadly_task = NULL; |
108 | GNUNET_SCHEDULER_add_now (&end, NULL); | 108 | GNUNET_SCHEDULER_add_now (&end, NULL); |
109 | } | 109 | } |
110 | 110 | ||
diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c index 73515e130..475fafa44 100644 --- a/src/namestore/test_namestore_api_store_update.c +++ b/src/namestore/test_namestore_api_store_update.c | |||
@@ -47,7 +47,7 @@ static struct GNUNET_NAMESTORE_Handle *nsh; | |||
47 | 47 | ||
48 | static struct GNUNET_NAMECACHE_Handle *nch; | 48 | static struct GNUNET_NAMECACHE_Handle *nch; |
49 | 49 | ||
50 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 50 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
51 | 51 | ||
52 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 52 | static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
53 | 53 | ||
@@ -168,7 +168,7 @@ rd_decrypt_cb (void *cls, | |||
168 | GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2)); | 168 | GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN2)); |
169 | 169 | ||
170 | GNUNET_SCHEDULER_cancel (endbadly_task); | 170 | GNUNET_SCHEDULER_cancel (endbadly_task); |
171 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 171 | endbadly_task = NULL; |
172 | GNUNET_SCHEDULER_add_now (&end, NULL); | 172 | GNUNET_SCHEDULER_add_now (&end, NULL); |
173 | } | 173 | } |
174 | } | 174 | } |
@@ -187,7 +187,7 @@ name_lookup_proc (void *cls, | |||
187 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 187 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
188 | _("Namecache returned no block for `%s'\n"), | 188 | _("Namecache returned no block for `%s'\n"), |
189 | name); | 189 | name); |
190 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 190 | if (endbadly_task != NULL) |
191 | GNUNET_SCHEDULER_cancel (endbadly_task); | 191 | GNUNET_SCHEDULER_cancel (endbadly_task); |
192 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 192 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
193 | return; | 193 | return; |
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 933845206..85f3b3fac 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | static struct GNUNET_NAMESTORE_Handle * nsh; | 33 | static struct GNUNET_NAMESTORE_Handle * nsh; |
34 | 34 | ||
35 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 35 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
36 | 36 | ||
37 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; | 37 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
38 | 38 | ||
@@ -117,10 +117,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
117 | GNUNET_NAMESTORE_zone_iteration_stop (zi); | 117 | GNUNET_NAMESTORE_zone_iteration_stop (zi); |
118 | zi = NULL; | 118 | zi = NULL; |
119 | } | 119 | } |
120 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 120 | if (endbadly_task != NULL) |
121 | { | 121 | { |
122 | GNUNET_SCHEDULER_cancel (endbadly_task); | 122 | GNUNET_SCHEDULER_cancel (endbadly_task); |
123 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 123 | endbadly_task = NULL; |
124 | } | 124 | } |
125 | 125 | ||
126 | if (privkey != NULL) | 126 | if (privkey != NULL) |
@@ -292,7 +292,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
292 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", | 292 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", |
293 | emsg); | 293 | emsg); |
294 | GNUNET_break (0); | 294 | GNUNET_break (0); |
295 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 295 | if (NULL != endbadly_task) |
296 | GNUNET_SCHEDULER_cancel (endbadly_task); | 296 | GNUNET_SCHEDULER_cancel (endbadly_task); |
297 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 297 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
298 | return; | 298 | return; |
@@ -311,7 +311,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
311 | { | 311 | { |
312 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); | 312 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); |
313 | GNUNET_break (0); | 313 | GNUNET_break (0); |
314 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 314 | if (NULL != endbadly_task) |
315 | GNUNET_SCHEDULER_cancel (endbadly_task); | 315 | GNUNET_SCHEDULER_cancel (endbadly_task); |
316 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 316 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
317 | return; | 317 | return; |
@@ -360,7 +360,7 @@ empty_zone_proc (void *cls, | |||
360 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 360 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
361 | _("Expected empty zone but received zone private key\n")); | 361 | _("Expected empty zone but received zone private key\n")); |
362 | GNUNET_break (0); | 362 | GNUNET_break (0); |
363 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 363 | if (endbadly_task != NULL) |
364 | GNUNET_SCHEDULER_cancel (endbadly_task); | 364 | GNUNET_SCHEDULER_cancel (endbadly_task); |
365 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 365 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
366 | return; | 366 | return; |
@@ -370,7 +370,7 @@ empty_zone_proc (void *cls, | |||
370 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 370 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
371 | _("Expected no zone content but received data\n")); | 371 | _("Expected no zone content but received data\n")); |
372 | GNUNET_break (0); | 372 | GNUNET_break (0); |
373 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 373 | if (endbadly_task != NULL) |
374 | GNUNET_SCHEDULER_cancel (endbadly_task); | 374 | GNUNET_SCHEDULER_cancel (endbadly_task); |
375 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 375 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
376 | return; | 376 | return; |
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c index 6ea4e39c0..5b8f5bde1 100644 --- a/src/namestore/test_namestore_api_zone_iteration_nick.c +++ b/src/namestore/test_namestore_api_zone_iteration_nick.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | static struct GNUNET_NAMESTORE_Handle * nsh; | 35 | static struct GNUNET_NAMESTORE_Handle * nsh; |
36 | 36 | ||
37 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 37 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
38 | 38 | ||
39 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; | 39 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
40 | 40 | ||
@@ -120,10 +120,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
120 | GNUNET_NAMESTORE_zone_iteration_stop (zi); | 120 | GNUNET_NAMESTORE_zone_iteration_stop (zi); |
121 | zi = NULL; | 121 | zi = NULL; |
122 | } | 122 | } |
123 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 123 | if (endbadly_task != NULL) |
124 | { | 124 | { |
125 | GNUNET_SCHEDULER_cancel (endbadly_task); | 125 | GNUNET_SCHEDULER_cancel (endbadly_task); |
126 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 126 | endbadly_task = NULL; |
127 | } | 127 | } |
128 | 128 | ||
129 | if (privkey != NULL) | 129 | if (privkey != NULL) |
@@ -268,7 +268,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
268 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", | 268 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", |
269 | emsg); | 269 | emsg); |
270 | GNUNET_break (0); | 270 | GNUNET_break (0); |
271 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 271 | if (NULL != endbadly_task) |
272 | GNUNET_SCHEDULER_cancel (endbadly_task); | 272 | GNUNET_SCHEDULER_cancel (endbadly_task); |
273 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 273 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
274 | return; | 274 | return; |
@@ -287,7 +287,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
287 | { | 287 | { |
288 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); | 288 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); |
289 | GNUNET_break (0); | 289 | GNUNET_break (0); |
290 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 290 | if (NULL != endbadly_task) |
291 | GNUNET_SCHEDULER_cancel (endbadly_task); | 291 | GNUNET_SCHEDULER_cancel (endbadly_task); |
292 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 292 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
293 | return; | 293 | return; |
@@ -385,7 +385,7 @@ empty_zone_proc (void *cls, | |||
385 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 385 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
386 | _("Expected empty zone but received zone private key\n")); | 386 | _("Expected empty zone but received zone private key\n")); |
387 | GNUNET_break (0); | 387 | GNUNET_break (0); |
388 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 388 | if (endbadly_task != NULL) |
389 | GNUNET_SCHEDULER_cancel (endbadly_task); | 389 | GNUNET_SCHEDULER_cancel (endbadly_task); |
390 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 390 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
391 | return; | 391 | return; |
@@ -395,7 +395,7 @@ empty_zone_proc (void *cls, | |||
395 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 395 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
396 | _("Expected no zone content but received data\n")); | 396 | _("Expected no zone content but received data\n")); |
397 | GNUNET_break (0); | 397 | GNUNET_break (0); |
398 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 398 | if (endbadly_task != NULL) |
399 | GNUNET_SCHEDULER_cancel (endbadly_task); | 399 | GNUNET_SCHEDULER_cancel (endbadly_task); |
400 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 400 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
401 | return; | 401 | return; |
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index ed393af8e..3f8d481d1 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | static struct GNUNET_NAMESTORE_Handle * nsh; | 34 | static struct GNUNET_NAMESTORE_Handle * nsh; |
35 | 35 | ||
36 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 36 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
37 | 37 | ||
38 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; | 38 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
39 | 39 | ||
@@ -118,10 +118,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
118 | zi = NULL; | 118 | zi = NULL; |
119 | } | 119 | } |
120 | 120 | ||
121 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 121 | if (endbadly_task != NULL) |
122 | { | 122 | { |
123 | GNUNET_SCHEDULER_cancel (endbadly_task); | 123 | GNUNET_SCHEDULER_cancel (endbadly_task); |
124 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 124 | endbadly_task = NULL; |
125 | } | 125 | } |
126 | 126 | ||
127 | if (privkey != NULL) | 127 | if (privkey != NULL) |
@@ -275,7 +275,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
275 | "Failed to created records: `%s'\n", | 275 | "Failed to created records: `%s'\n", |
276 | emsg); | 276 | emsg); |
277 | GNUNET_break (0); | 277 | GNUNET_break (0); |
278 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 278 | if (NULL != endbadly_task) |
279 | GNUNET_SCHEDULER_cancel (endbadly_task); | 279 | GNUNET_SCHEDULER_cancel (endbadly_task); |
280 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 280 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
281 | return; | 281 | return; |
@@ -296,7 +296,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
296 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 296 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
297 | "Failed to create zone iterator\n"); | 297 | "Failed to create zone iterator\n"); |
298 | GNUNET_break (0); | 298 | GNUNET_break (0); |
299 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 299 | if (NULL != endbadly_task) |
300 | GNUNET_SCHEDULER_cancel (endbadly_task); | 300 | GNUNET_SCHEDULER_cancel (endbadly_task); |
301 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 301 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
302 | return; | 302 | return; |
@@ -345,7 +345,7 @@ empty_zone_proc (void *cls, | |||
345 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 345 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
346 | _("Expected empty zone but received zone private key\n")); | 346 | _("Expected empty zone but received zone private key\n")); |
347 | GNUNET_break (0); | 347 | GNUNET_break (0); |
348 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 348 | if (endbadly_task != NULL) |
349 | GNUNET_SCHEDULER_cancel (endbadly_task); | 349 | GNUNET_SCHEDULER_cancel (endbadly_task); |
350 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 350 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
351 | return; | 351 | return; |
@@ -355,7 +355,7 @@ empty_zone_proc (void *cls, | |||
355 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 355 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
356 | _("Expected no zone content but received data\n")); | 356 | _("Expected no zone content but received data\n")); |
357 | GNUNET_break (0); | 357 | GNUNET_break (0); |
358 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 358 | if (endbadly_task != NULL) |
359 | GNUNET_SCHEDULER_cancel (endbadly_task); | 359 | GNUNET_SCHEDULER_cancel (endbadly_task); |
360 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 360 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
361 | return; | 361 | return; |
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index 38aae9b6d..942c381a3 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | static struct GNUNET_NAMESTORE_Handle * nsh; | 33 | static struct GNUNET_NAMESTORE_Handle * nsh; |
34 | 34 | ||
35 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 35 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
36 | 36 | ||
37 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; | 37 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
38 | 38 | ||
@@ -118,10 +118,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
118 | zi = NULL; | 118 | zi = NULL; |
119 | } | 119 | } |
120 | 120 | ||
121 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 121 | if (endbadly_task != NULL) |
122 | { | 122 | { |
123 | GNUNET_SCHEDULER_cancel (endbadly_task); | 123 | GNUNET_SCHEDULER_cancel (endbadly_task); |
124 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 124 | endbadly_task = NULL; |
125 | } | 125 | } |
126 | 126 | ||
127 | if (privkey != NULL) | 127 | if (privkey != NULL) |
@@ -266,10 +266,10 @@ zone_proc (void *cls, | |||
266 | "Telling namestore to stop zone iteration\n"); | 266 | "Telling namestore to stop zone iteration\n"); |
267 | GNUNET_NAMESTORE_zone_iteration_stop (zi); | 267 | GNUNET_NAMESTORE_zone_iteration_stop (zi); |
268 | zi = NULL; | 268 | zi = NULL; |
269 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 269 | if (NULL != endbadly_task) |
270 | { | 270 | { |
271 | GNUNET_SCHEDULER_cancel (endbadly_task); | 271 | GNUNET_SCHEDULER_cancel (endbadly_task); |
272 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 272 | endbadly_task = NULL; |
273 | } | 273 | } |
274 | res = 0; | 274 | res = 0; |
275 | GNUNET_SCHEDULER_add_delayed (WAIT, &end, NULL); | 275 | GNUNET_SCHEDULER_add_delayed (WAIT, &end, NULL); |
@@ -303,7 +303,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
303 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", | 303 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", |
304 | emsg); | 304 | emsg); |
305 | GNUNET_break (0); | 305 | GNUNET_break (0); |
306 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 306 | if (NULL != endbadly_task) |
307 | GNUNET_SCHEDULER_cancel (endbadly_task); | 307 | GNUNET_SCHEDULER_cancel (endbadly_task); |
308 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 308 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
309 | return; | 309 | return; |
@@ -322,7 +322,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
322 | { | 322 | { |
323 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); | 323 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n"); |
324 | GNUNET_break (0); | 324 | GNUNET_break (0); |
325 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 325 | if (NULL != endbadly_task) |
326 | GNUNET_SCHEDULER_cancel (endbadly_task); | 326 | GNUNET_SCHEDULER_cancel (endbadly_task); |
327 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 327 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
328 | return; | 328 | return; |
@@ -371,7 +371,7 @@ empty_zone_proc (void *cls, | |||
371 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 371 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
372 | _("Expected empty zone but received zone private key\n")); | 372 | _("Expected empty zone but received zone private key\n")); |
373 | GNUNET_break (0); | 373 | GNUNET_break (0); |
374 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 374 | if (endbadly_task != NULL) |
375 | GNUNET_SCHEDULER_cancel (endbadly_task); | 375 | GNUNET_SCHEDULER_cancel (endbadly_task); |
376 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 376 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
377 | return; | 377 | return; |
@@ -381,7 +381,7 @@ empty_zone_proc (void *cls, | |||
381 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 381 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
382 | _("Expected no zone content but received data\n")); | 382 | _("Expected no zone content but received data\n")); |
383 | GNUNET_break (0); | 383 | GNUNET_break (0); |
384 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 384 | if (endbadly_task != NULL) |
385 | GNUNET_SCHEDULER_cancel (endbadly_task); | 385 | GNUNET_SCHEDULER_cancel (endbadly_task); |
386 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 386 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
387 | return; | 387 | return; |
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 9ade0cfc1..5c75fcb91 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c | |||
@@ -39,7 +39,7 @@ | |||
39 | 39 | ||
40 | static struct GNUNET_NAMESTORE_Handle * nsh; | 40 | static struct GNUNET_NAMESTORE_Handle * nsh; |
41 | 41 | ||
42 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 42 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
43 | 43 | ||
44 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; | 44 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
45 | 45 | ||
@@ -81,10 +81,10 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
81 | static void | 81 | static void |
82 | end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 82 | end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
83 | { | 83 | { |
84 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 84 | if (endbadly_task != NULL) |
85 | { | 85 | { |
86 | GNUNET_SCHEDULER_cancel (endbadly_task); | 86 | GNUNET_SCHEDULER_cancel (endbadly_task); |
87 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 87 | endbadly_task = NULL; |
88 | } | 88 | } |
89 | if (privkey != NULL) | 89 | if (privkey != NULL) |
90 | GNUNET_free (privkey); | 90 | GNUNET_free (privkey); |