diff options
Diffstat (limited to 'src/fs/fs_api.c')
-rw-r--r-- | src/fs/fs_api.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 302020d7d..6c534ff32 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c | |||
@@ -131,7 +131,7 @@ process_job_queue (void *cls, | |||
131 | int num_downloads_change; | 131 | int num_downloads_change; |
132 | int block_limit_hit; | 132 | int block_limit_hit; |
133 | 133 | ||
134 | h->queue_job = GNUNET_SCHEDULER_NO_TASK; | 134 | h->queue_job = NULL; |
135 | /* restart_at will be set to the time when it makes sense to | 135 | /* restart_at will be set to the time when it makes sense to |
136 | re-evaluate the job queue (unless, of course, jobs complete | 136 | re-evaluate the job queue (unless, of course, jobs complete |
137 | or are added, then we'll be triggered immediately */ | 137 | or are added, then we'll be triggered immediately */ |
@@ -336,7 +336,7 @@ GNUNET_FS_queue_ (struct GNUNET_FS_Handle *h, | |||
336 | qe->priority = priority; | 336 | qe->priority = priority; |
337 | GNUNET_CONTAINER_DLL_insert_after (h->pending_head, h->pending_tail, | 337 | GNUNET_CONTAINER_DLL_insert_after (h->pending_head, h->pending_tail, |
338 | h->pending_tail, qe); | 338 | h->pending_tail, qe); |
339 | if (h->queue_job != GNUNET_SCHEDULER_NO_TASK) | 339 | if (h->queue_job != NULL) |
340 | GNUNET_SCHEDULER_cancel (h->queue_job); | 340 | GNUNET_SCHEDULER_cancel (h->queue_job); |
341 | h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h); | 341 | h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h); |
342 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 342 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -364,7 +364,7 @@ GNUNET_FS_dequeue_ (struct GNUNET_FS_QueueEntry *qe) | |||
364 | stop_job (qe); | 364 | stop_job (qe); |
365 | GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, qe); | 365 | GNUNET_CONTAINER_DLL_remove (h->pending_head, h->pending_tail, qe); |
366 | GNUNET_free (qe); | 366 | GNUNET_free (qe); |
367 | if (h->queue_job != GNUNET_SCHEDULER_NO_TASK) | 367 | if (h->queue_job != NULL) |
368 | GNUNET_SCHEDULER_cancel (h->queue_job); | 368 | GNUNET_SCHEDULER_cancel (h->queue_job); |
369 | h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h); | 369 | h->queue_job = GNUNET_SCHEDULER_add_now (&process_job_queue, h); |
370 | } | 370 | } |
@@ -1619,7 +1619,7 @@ deserialize_publish_file (void *cls, | |||
1619 | /* re-start publishing (if needed)... */ | 1619 | /* re-start publishing (if needed)... */ |
1620 | if (GNUNET_YES != pc->all_done) | 1620 | if (GNUNET_YES != pc->all_done) |
1621 | { | 1621 | { |
1622 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); | 1622 | GNUNET_assert (NULL == pc->upload_task); |
1623 | pc->upload_task = | 1623 | pc->upload_task = |
1624 | GNUNET_SCHEDULER_add_with_priority | 1624 | GNUNET_SCHEDULER_add_with_priority |
1625 | (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, | 1625 | (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, |
@@ -2140,7 +2140,7 @@ GNUNET_FS_search_sync_ (struct GNUNET_FS_SearchContext *sc) | |||
2140 | GNUNET_assert ((GNUNET_YES == GNUNET_FS_uri_test_ksk (sc->uri)) || | 2140 | GNUNET_assert ((GNUNET_YES == GNUNET_FS_uri_test_ksk (sc->uri)) || |
2141 | (GNUNET_YES == GNUNET_FS_uri_test_sks (sc->uri))); | 2141 | (GNUNET_YES == GNUNET_FS_uri_test_sks (sc->uri))); |
2142 | uris = GNUNET_FS_uri_to_string (sc->uri); | 2142 | uris = GNUNET_FS_uri_to_string (sc->uri); |
2143 | in_pause = (sc->task != GNUNET_SCHEDULER_NO_TASK) ? 'r' : '\0'; | 2143 | in_pause = (sc->task != NULL) ? 'r' : '\0'; |
2144 | if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uris)) || | 2144 | if ((GNUNET_OK != GNUNET_BIO_write_string (wh, uris)) || |
2145 | (GNUNET_OK != write_start_time (wh, sc->start_time)) || | 2145 | (GNUNET_OK != write_start_time (wh, sc->start_time)) || |
2146 | (GNUNET_OK != GNUNET_BIO_write_string (wh, sc->emsg)) || | 2146 | (GNUNET_OK != GNUNET_BIO_write_string (wh, sc->emsg)) || |
@@ -3130,7 +3130,7 @@ GNUNET_FS_stop (struct GNUNET_FS_Handle *h) | |||
3130 | { | 3130 | { |
3131 | while (h->top_head != NULL) | 3131 | while (h->top_head != NULL) |
3132 | h->top_head->ssf (h->top_head->ssf_cls); | 3132 | h->top_head->ssf (h->top_head->ssf_cls); |
3133 | if (h->queue_job != GNUNET_SCHEDULER_NO_TASK) | 3133 | if (h->queue_job != NULL) |
3134 | GNUNET_SCHEDULER_cancel (h->queue_job); | 3134 | GNUNET_SCHEDULER_cancel (h->queue_job); |
3135 | GNUNET_free (h->client_name); | 3135 | GNUNET_free (h->client_name); |
3136 | GNUNET_free (h); | 3136 | GNUNET_free (h); |