diff options
Diffstat (limited to 'src/fs/fs_download.c')
-rw-r--r-- | src/fs/fs_download.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index 348a0bc17..3a6072d8b 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c | |||
@@ -393,10 +393,10 @@ check_completed (struct GNUNET_FS_DownloadContext *dc) | |||
393 | GNUNET_FS_dequeue_ (dc->job_queue); | 393 | GNUNET_FS_dequeue_ (dc->job_queue); |
394 | dc->job_queue = NULL; | 394 | dc->job_queue = NULL; |
395 | } | 395 | } |
396 | if (GNUNET_SCHEDULER_NO_TASK != dc->task) | 396 | if (NULL != dc->task) |
397 | { | 397 | { |
398 | GNUNET_SCHEDULER_cancel (dc->task); | 398 | GNUNET_SCHEDULER_cancel (dc->task); |
399 | dc->task = GNUNET_SCHEDULER_NO_TASK; | 399 | dc->task = NULL; |
400 | } | 400 | } |
401 | if (NULL != dc->rfh) | 401 | if (NULL != dc->rfh) |
402 | { | 402 | { |
@@ -1380,7 +1380,7 @@ do_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1380 | struct GNUNET_FS_DownloadContext *dc = cls; | 1380 | struct GNUNET_FS_DownloadContext *dc = cls; |
1381 | struct GNUNET_CLIENT_Connection *client; | 1381 | struct GNUNET_CLIENT_Connection *client; |
1382 | 1382 | ||
1383 | dc->task = GNUNET_SCHEDULER_NO_TASK; | 1383 | dc->task = NULL; |
1384 | client = GNUNET_CLIENT_connect ("fs", dc->h->cfg); | 1384 | client = GNUNET_CLIENT_connect ("fs", dc->h->cfg); |
1385 | if (NULL == client) | 1385 | if (NULL == client) |
1386 | { | 1386 | { |
@@ -1633,10 +1633,10 @@ reconstruct_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1633 | struct GNUNET_FS_DownloadContext *dc = cls; | 1633 | struct GNUNET_FS_DownloadContext *dc = cls; |
1634 | 1634 | ||
1635 | /* clean up state from tree encoder */ | 1635 | /* clean up state from tree encoder */ |
1636 | if (dc->task != GNUNET_SCHEDULER_NO_TASK) | 1636 | if (dc->task != NULL) |
1637 | { | 1637 | { |
1638 | GNUNET_SCHEDULER_cancel (dc->task); | 1638 | GNUNET_SCHEDULER_cancel (dc->task); |
1639 | dc->task = GNUNET_SCHEDULER_NO_TASK; | 1639 | dc->task = NULL; |
1640 | } | 1640 | } |
1641 | if (NULL != dc->rfh) | 1641 | if (NULL != dc->rfh) |
1642 | { | 1642 | { |
@@ -1662,7 +1662,7 @@ get_next_block (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1662 | { | 1662 | { |
1663 | struct GNUNET_FS_DownloadContext *dc = cls; | 1663 | struct GNUNET_FS_DownloadContext *dc = cls; |
1664 | 1664 | ||
1665 | dc->task = GNUNET_SCHEDULER_NO_TASK; | 1665 | dc->task = NULL; |
1666 | GNUNET_FS_tree_encoder_next (dc->te); | 1666 | GNUNET_FS_tree_encoder_next (dc->te); |
1667 | } | 1667 | } |
1668 | 1668 | ||
@@ -1866,7 +1866,7 @@ GNUNET_FS_download_start_task_ (void *cls, | |||
1866 | struct GNUNET_DISK_FileHandle *fh; | 1866 | struct GNUNET_DISK_FileHandle *fh; |
1867 | 1867 | ||
1868 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start task running...\n"); | 1868 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start task running...\n"); |
1869 | dc->task = GNUNET_SCHEDULER_NO_TASK; | 1869 | dc->task = NULL; |
1870 | if (0 == dc->length) | 1870 | if (0 == dc->length) |
1871 | { | 1871 | { |
1872 | /* no bytes required! */ | 1872 | /* no bytes required! */ |
@@ -2028,10 +2028,10 @@ GNUNET_FS_download_signal_suspend_ (void *cls) | |||
2028 | if (NULL != dc->parent) | 2028 | if (NULL != dc->parent) |
2029 | GNUNET_CONTAINER_DLL_remove (dc->parent->child_head, dc->parent->child_tail, | 2029 | GNUNET_CONTAINER_DLL_remove (dc->parent->child_head, dc->parent->child_tail, |
2030 | dc); | 2030 | dc); |
2031 | if (GNUNET_SCHEDULER_NO_TASK != dc->task) | 2031 | if (NULL != dc->task) |
2032 | { | 2032 | { |
2033 | GNUNET_SCHEDULER_cancel (dc->task); | 2033 | GNUNET_SCHEDULER_cancel (dc->task); |
2034 | dc->task = GNUNET_SCHEDULER_NO_TASK; | 2034 | dc->task = NULL; |
2035 | } | 2035 | } |
2036 | pi.status = GNUNET_FS_STATUS_DOWNLOAD_SUSPEND; | 2036 | pi.status = GNUNET_FS_STATUS_DOWNLOAD_SUSPEND; |
2037 | GNUNET_FS_download_make_status_ (&pi, dc); | 2037 | GNUNET_FS_download_make_status_ (&pi, dc); |
@@ -2336,10 +2336,10 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete) | |||
2336 | 2336 | ||
2337 | if (NULL != dc->top) | 2337 | if (NULL != dc->top) |
2338 | GNUNET_FS_end_top (dc->h, dc->top); | 2338 | GNUNET_FS_end_top (dc->h, dc->top); |
2339 | if (GNUNET_SCHEDULER_NO_TASK != dc->task) | 2339 | if (NULL != dc->task) |
2340 | { | 2340 | { |
2341 | GNUNET_SCHEDULER_cancel (dc->task); | 2341 | GNUNET_SCHEDULER_cancel (dc->task); |
2342 | dc->task = GNUNET_SCHEDULER_NO_TASK; | 2342 | dc->task = NULL; |
2343 | } | 2343 | } |
2344 | search_was_null = (NULL == dc->search); | 2344 | search_was_null = (NULL == dc->search); |
2345 | if (NULL != dc->search) | 2345 | if (NULL != dc->search) |