aboutsummaryrefslogtreecommitdiff
path: root/src/peerinfo/peerinfo_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/peerinfo/peerinfo_api.c')
-rw-r--r--src/peerinfo/peerinfo_api.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 20042f8e3..e2539bd55 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -110,7 +110,7 @@ struct GNUNET_PEERINFO_IteratorContext
110 /** 110 /**
111 * Task responsible for timeout. 111 * Task responsible for timeout.
112 */ 112 */
113 GNUNET_SCHEDULER_TaskIdentifier timeout_task; 113 struct GNUNET_SCHEDULER_Task * timeout_task;
114 114
115 /** 115 /**
116 * Timeout for the operation. 116 * Timeout for the operation.
@@ -179,7 +179,7 @@ struct GNUNET_PEERINFO_Handle
179 /** 179 /**
180 * ID for a reconnect task. 180 * ID for a reconnect task.
181 */ 181 */
182 GNUNET_SCHEDULER_TaskIdentifier r_task; 182 struct GNUNET_SCHEDULER_Task * r_task;
183 183
184 /** 184 /**
185 * Are we now receiving? 185 * Are we now receiving?
@@ -247,10 +247,10 @@ GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h)
247 GNUNET_CLIENT_disconnect (h->client); 247 GNUNET_CLIENT_disconnect (h->client);
248 h->client = NULL; 248 h->client = NULL;
249 } 249 }
250 if (GNUNET_SCHEDULER_NO_TASK != h->r_task) 250 if (NULL != h->r_task)
251 { 251 {
252 GNUNET_SCHEDULER_cancel (h->r_task); 252 GNUNET_SCHEDULER_cancel (h->r_task);
253 h->r_task = GNUNET_SCHEDULER_NO_TASK; 253 h->r_task = NULL;
254 } 254 }
255 GNUNET_free (h); 255 GNUNET_free (h);
256} 256}
@@ -287,7 +287,7 @@ reconnect_task (void *cls,
287{ 287{
288 struct GNUNET_PEERINFO_Handle *h = cls; 288 struct GNUNET_PEERINFO_Handle *h = cls;
289 289
290 h->r_task = GNUNET_SCHEDULER_NO_TASK; 290 h->r_task = NULL;
291 reconnect (h); 291 reconnect (h);
292} 292}
293 293
@@ -300,10 +300,10 @@ reconnect_task (void *cls,
300static void 300static void
301reconnect (struct GNUNET_PEERINFO_Handle *h) 301reconnect (struct GNUNET_PEERINFO_Handle *h)
302{ 302{
303 if (GNUNET_SCHEDULER_NO_TASK != h->r_task) 303 if (NULL != h->r_task)
304 { 304 {
305 GNUNET_SCHEDULER_cancel (h->r_task); 305 GNUNET_SCHEDULER_cancel (h->r_task);
306 h->r_task = GNUNET_SCHEDULER_NO_TASK; 306 h->r_task = NULL;
307 } 307 }
308 if (NULL != h->th) 308 if (NULL != h->th)
309 { 309 {
@@ -709,7 +709,7 @@ signal_timeout (void *cls,
709 GNUNET_PEERINFO_Processor cb; 709 GNUNET_PEERINFO_Processor cb;
710 void *cb_cls; 710 void *cb_cls;
711 711
712 ic->timeout_task = GNUNET_SCHEDULER_NO_TASK; 712 ic->timeout_task = NULL;
713 cb = ic->callback; 713 cb = ic->callback;
714 cb_cls = ic->callback_cls; 714 cb_cls = ic->callback_cls;
715 GNUNET_PEERINFO_iterate_cancel (ic); 715 GNUNET_PEERINFO_iterate_cancel (ic);
@@ -811,10 +811,10 @@ GNUNET_PEERINFO_iterate_cancel (struct GNUNET_PEERINFO_IteratorContext *ic)
811 struct GNUNET_PEERINFO_Handle *h; 811 struct GNUNET_PEERINFO_Handle *h;
812 812
813 h = ic->h; 813 h = ic->h;
814 if (GNUNET_SCHEDULER_NO_TASK != ic->timeout_task) 814 if (NULL != ic->timeout_task)
815 { 815 {
816 GNUNET_SCHEDULER_cancel (ic->timeout_task); 816 GNUNET_SCHEDULER_cancel (ic->timeout_task);
817 ic->timeout_task = GNUNET_SCHEDULER_NO_TASK; 817 ic->timeout_task = NULL;
818 } 818 }
819 ic->callback = NULL; 819 ic->callback = NULL;
820 if (GNUNET_YES == ic->request_transmitted) 820 if (GNUNET_YES == ic->request_transmitted)