diff options
Diffstat (limited to 'src/fs/gnunet-service-fs_pe.c')
-rw-r--r-- | src/fs/gnunet-service-fs_pe.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index 07b6b4d65..6b793a1e0 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c | |||
@@ -196,7 +196,7 @@ struct PeerPlan | |||
196 | /** | 196 | /** |
197 | * Current task for executing the plan. | 197 | * Current task for executing the plan. |
198 | */ | 198 | */ |
199 | GNUNET_SCHEDULER_TaskIdentifier task; | 199 | struct GNUNET_SCHEDULER_Task * task; |
200 | }; | 200 | }; |
201 | 201 | ||
202 | 202 | ||
@@ -337,7 +337,7 @@ plan (struct PeerPlan *pp, struct GSF_RequestPlan *rp) | |||
337 | GNUNET_CONTAINER_multihashmap_contains_value (pp->plan_map, | 337 | GNUNET_CONTAINER_multihashmap_contains_value (pp->plan_map, |
338 | get_rp_key (rp), | 338 | get_rp_key (rp), |
339 | rp)); | 339 | rp)); |
340 | if (GNUNET_SCHEDULER_NO_TASK != pp->task) | 340 | if (NULL != pp->task) |
341 | GNUNET_SCHEDULER_cancel (pp->task); | 341 | GNUNET_SCHEDULER_cancel (pp->task); |
342 | pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp); | 342 | pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp); |
343 | #undef N | 343 | #undef N |
@@ -391,7 +391,7 @@ transmit_message_callback (void *cls, size_t buf_size, void *buf) | |||
391 | if (NULL == buf) | 391 | if (NULL == buf) |
392 | { | 392 | { |
393 | /* failed, try again... */ | 393 | /* failed, try again... */ |
394 | if (GNUNET_SCHEDULER_NO_TASK != pp->task) | 394 | if (NULL != pp->task) |
395 | GNUNET_SCHEDULER_cancel (pp->task); | 395 | GNUNET_SCHEDULER_cancel (pp->task); |
396 | 396 | ||
397 | pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp); | 397 | pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp); |
@@ -404,7 +404,7 @@ transmit_message_callback (void *cls, size_t buf_size, void *buf) | |||
404 | rp = GNUNET_CONTAINER_heap_peek (pp->priority_heap); | 404 | rp = GNUNET_CONTAINER_heap_peek (pp->priority_heap); |
405 | if (NULL == rp) | 405 | if (NULL == rp) |
406 | { | 406 | { |
407 | if (GNUNET_SCHEDULER_NO_TASK != pp->task) | 407 | if (NULL != pp->task) |
408 | GNUNET_SCHEDULER_cancel (pp->task); | 408 | GNUNET_SCHEDULER_cancel (pp->task); |
409 | pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp); | 409 | pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp); |
410 | return 0; | 410 | return 0; |
@@ -412,7 +412,7 @@ transmit_message_callback (void *cls, size_t buf_size, void *buf) | |||
412 | msize = GSF_pending_request_get_message_ (get_latest (rp), buf_size, buf); | 412 | msize = GSF_pending_request_get_message_ (get_latest (rp), buf_size, buf); |
413 | if (msize > buf_size) | 413 | if (msize > buf_size) |
414 | { | 414 | { |
415 | if (GNUNET_SCHEDULER_NO_TASK != pp->task) | 415 | if (NULL != pp->task) |
416 | GNUNET_SCHEDULER_cancel (pp->task); | 416 | GNUNET_SCHEDULER_cancel (pp->task); |
417 | /* buffer to small (message changed), try again */ | 417 | /* buffer to small (message changed), try again */ |
418 | pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp); | 418 | pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp); |
@@ -451,7 +451,7 @@ schedule_peer_transmission (void *cls, | |||
451 | size_t msize; | 451 | size_t msize; |
452 | struct GNUNET_TIME_Relative delay; | 452 | struct GNUNET_TIME_Relative delay; |
453 | 453 | ||
454 | pp->task = GNUNET_SCHEDULER_NO_TASK; | 454 | pp->task = NULL; |
455 | if (NULL != pp->pth) | 455 | if (NULL != pp->pth) |
456 | { | 456 | { |
457 | GSF_peer_transmit_cancel_ (pp->pth); | 457 | GSF_peer_transmit_cancel_ (pp->pth); |
@@ -661,10 +661,10 @@ GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp) | |||
661 | GSF_peer_transmit_cancel_ (pp->pth); | 661 | GSF_peer_transmit_cancel_ (pp->pth); |
662 | pp->pth = NULL; | 662 | pp->pth = NULL; |
663 | } | 663 | } |
664 | if (GNUNET_SCHEDULER_NO_TASK != pp->task) | 664 | if (NULL != pp->task) |
665 | { | 665 | { |
666 | GNUNET_SCHEDULER_cancel (pp->task); | 666 | GNUNET_SCHEDULER_cancel (pp->task); |
667 | pp->task = GNUNET_SCHEDULER_NO_TASK; | 667 | pp->task = NULL; |
668 | } | 668 | } |
669 | while (NULL != (rp = GNUNET_CONTAINER_heap_remove_root (pp->priority_heap))) | 669 | while (NULL != (rp = GNUNET_CONTAINER_heap_remove_root (pp->priority_heap))) |
670 | { | 670 | { |