aboutsummaryrefslogtreecommitdiff
path: root/src/util/helper.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/helper.c')
-rw-r--r--src/util/helper.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/util/helper.c b/src/util/helper.c
index 105ccf057..6dd417a91 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -142,17 +142,17 @@ struct GNUNET_HELPER_Handle
142 /** 142 /**
143 * Task to read from the helper. 143 * Task to read from the helper.
144 */ 144 */
145 GNUNET_SCHEDULER_TaskIdentifier read_task; 145 struct GNUNET_SCHEDULER_Task * read_task;
146 146
147 /** 147 /**
148 * Task to read from the helper. 148 * Task to read from the helper.
149 */ 149 */
150 GNUNET_SCHEDULER_TaskIdentifier write_task; 150 struct GNUNET_SCHEDULER_Task * write_task;
151 151
152 /** 152 /**
153 * Restart task. 153 * Restart task.
154 */ 154 */
155 GNUNET_SCHEDULER_TaskIdentifier restart_task; 155 struct GNUNET_SCHEDULER_Task * restart_task;
156 156
157 /** 157 /**
158 * Does the helper support the use of a control pipe for signalling? 158 * Does the helper support the use of a control pipe for signalling?
@@ -187,15 +187,15 @@ GNUNET_HELPER_kill (struct GNUNET_HELPER_Handle *h,
187 sh->cont (sh->cont_cls, GNUNET_NO); 187 sh->cont (sh->cont_cls, GNUNET_NO);
188 GNUNET_free (sh); 188 GNUNET_free (sh);
189 } 189 }
190 if (GNUNET_SCHEDULER_NO_TASK != h->restart_task) 190 if (NULL != h->restart_task)
191 { 191 {
192 GNUNET_SCHEDULER_cancel (h->restart_task); 192 GNUNET_SCHEDULER_cancel (h->restart_task);
193 h->restart_task = GNUNET_SCHEDULER_NO_TASK; 193 h->restart_task = NULL;
194 } 194 }
195 if (GNUNET_SCHEDULER_NO_TASK != h->read_task) 195 if (NULL != h->read_task)
196 { 196 {
197 GNUNET_SCHEDULER_cancel (h->read_task); 197 GNUNET_SCHEDULER_cancel (h->read_task);
198 h->read_task = GNUNET_SCHEDULER_NO_TASK; 198 h->read_task = NULL;
199 } 199 }
200 if (NULL == h->helper_proc) 200 if (NULL == h->helper_proc)
201 return GNUNET_SYSERR; 201 return GNUNET_SYSERR;
@@ -235,15 +235,15 @@ GNUNET_HELPER_wait (struct GNUNET_HELPER_Handle *h)
235 GNUNET_OS_process_destroy (h->helper_proc); 235 GNUNET_OS_process_destroy (h->helper_proc);
236 h->helper_proc = NULL; 236 h->helper_proc = NULL;
237 } 237 }
238 if (GNUNET_SCHEDULER_NO_TASK != h->read_task) 238 if (NULL != h->read_task)
239 { 239 {
240 GNUNET_SCHEDULER_cancel (h->read_task); 240 GNUNET_SCHEDULER_cancel (h->read_task);
241 h->read_task = GNUNET_SCHEDULER_NO_TASK; 241 h->read_task = NULL;
242 } 242 }
243 if (GNUNET_SCHEDULER_NO_TASK != h->write_task) 243 if (NULL != h->write_task)
244 { 244 {
245 GNUNET_SCHEDULER_cancel (h->write_task); 245 GNUNET_SCHEDULER_cancel (h->write_task);
246 h->write_task = GNUNET_SCHEDULER_NO_TASK; 246 h->write_task = NULL;
247 } 247 }
248 if (NULL != h->helper_in) 248 if (NULL != h->helper_in)
249 { 249 {
@@ -284,10 +284,10 @@ static void
284stop_helper (struct GNUNET_HELPER_Handle *h, 284stop_helper (struct GNUNET_HELPER_Handle *h,
285 int soft_kill) 285 int soft_kill)
286{ 286{
287 if (GNUNET_SCHEDULER_NO_TASK != h->restart_task) 287 if (NULL != h->restart_task)
288 { 288 {
289 GNUNET_SCHEDULER_cancel (h->restart_task); 289 GNUNET_SCHEDULER_cancel (h->restart_task);
290 h->restart_task = GNUNET_SCHEDULER_NO_TASK; 290 h->restart_task = NULL;
291 } 291 }
292 else 292 else
293 { 293 {
@@ -322,7 +322,7 @@ helper_read (void *cls,
322 char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE] GNUNET_ALIGN; 322 char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE] GNUNET_ALIGN;
323 ssize_t t; 323 ssize_t t;
324 324
325 h->read_task = GNUNET_SCHEDULER_NO_TASK; 325 h->read_task = NULL;
326 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) 326 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
327 { 327 {
328 /* try again */ 328 /* try again */
@@ -460,7 +460,7 @@ restart_task (void *cls,
460{ 460{
461 struct GNUNET_HELPER_Handle*h = cls; 461 struct GNUNET_HELPER_Handle*h = cls;
462 462
463 h->restart_task = GNUNET_SCHEDULER_NO_TASK; 463 h->restart_task = NULL;
464 start_helper (h); 464 start_helper (h);
465} 465}
466 466
@@ -524,13 +524,13 @@ GNUNET_HELPER_destroy (struct GNUNET_HELPER_Handle *h)
524 unsigned int c; 524 unsigned int c;
525 struct GNUNET_HELPER_SendHandle *sh; 525 struct GNUNET_HELPER_SendHandle *sh;
526 526
527 if (GNUNET_SCHEDULER_NO_TASK != h->write_task) 527 if (NULL != h->write_task)
528 { 528 {
529 GNUNET_SCHEDULER_cancel (h->write_task); 529 GNUNET_SCHEDULER_cancel (h->write_task);
530 h->write_task = GNUNET_SCHEDULER_NO_TASK; 530 h->write_task = NULL;
531 } 531 }
532 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->read_task); 532 GNUNET_assert (NULL == h->read_task);
533 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->restart_task); 533 GNUNET_assert (NULL == h->restart_task);
534 while (NULL != (sh = h->sh_head)) 534 while (NULL != (sh = h->sh_head))
535 { 535 {
536 GNUNET_CONTAINER_DLL_remove (h->sh_head, 536 GNUNET_CONTAINER_DLL_remove (h->sh_head,
@@ -582,7 +582,7 @@ helper_write (void *cls,
582 const char *buf; 582 const char *buf;
583 ssize_t t; 583 ssize_t t;
584 584
585 h->write_task = GNUNET_SCHEDULER_NO_TASK; 585 h->write_task = NULL;
586 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) 586 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
587 { 587 {
588 /* try again */ 588 /* try again */
@@ -684,7 +684,7 @@ GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
684 GNUNET_CONTAINER_DLL_insert_tail (h->sh_head, 684 GNUNET_CONTAINER_DLL_insert_tail (h->sh_head,
685 h->sh_tail, 685 h->sh_tail,
686 sh); 686 sh);
687 if (GNUNET_SCHEDULER_NO_TASK == h->write_task) 687 if (NULL == h->write_task)
688 h->write_task = GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL, 688 h->write_task = GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
689 h->fh_to_helper, 689 h->fh_to_helper,
690 &helper_write, 690 &helper_write,
@@ -714,7 +714,7 @@ GNUNET_HELPER_send_cancel (struct GNUNET_HELPER_SendHandle *sh)
714 if (NULL == h->sh_head) 714 if (NULL == h->sh_head)
715 { 715 {
716 GNUNET_SCHEDULER_cancel (h->write_task); 716 GNUNET_SCHEDULER_cancel (h->write_task);
717 h->write_task = GNUNET_SCHEDULER_NO_TASK; 717 h->write_task = NULL;
718 } 718 }
719 } 719 }
720} 720}