diff options
Diffstat (limited to 'src/namestore/test_namestore_api_lookup_shadow_filter.c')
-rw-r--r-- | src/namestore/test_namestore_api_lookup_shadow_filter.c | 16 |
1 files changed, 8 insertions, 8 deletions
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 | } |