diff options
Diffstat (limited to 'src/namestore/test_namestore_api_zone_iteration_stop.c')
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_stop.c | 18 |
1 files changed, 9 insertions, 9 deletions
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; |