diff options
Diffstat (limited to 'src/fs/gnunet-auto-share.c')
-rw-r--r-- | src/fs/gnunet-auto-share.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c index 32725f66f..c3b19b9ed 100644 --- a/src/fs/gnunet-auto-share.c +++ b/src/fs/gnunet-auto-share.c | |||
@@ -97,12 +97,12 @@ static int do_disable_creation_time; | |||
97 | /** | 97 | /** |
98 | * Handle for the 'shutdown' task. | 98 | * Handle for the 'shutdown' task. |
99 | */ | 99 | */ |
100 | static GNUNET_SCHEDULER_TaskIdentifier kill_task; | 100 | static struct GNUNET_SCHEDULER_Task * kill_task; |
101 | 101 | ||
102 | /** | 102 | /** |
103 | * Handle for the main task that does scanning and working. | 103 | * Handle for the main task that does scanning and working. |
104 | */ | 104 | */ |
105 | static GNUNET_SCHEDULER_TaskIdentifier run_task; | 105 | static struct GNUNET_SCHEDULER_Task * run_task; |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * Anonymity level option to use for publishing. | 108 | * Anonymity level option to use for publishing. |
@@ -322,17 +322,17 @@ save_state () | |||
322 | static void | 322 | static void |
323 | do_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 323 | do_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
324 | { | 324 | { |
325 | kill_task = GNUNET_SCHEDULER_NO_TASK; | 325 | kill_task = NULL; |
326 | do_shutdown = GNUNET_YES; | 326 | do_shutdown = GNUNET_YES; |
327 | if (NULL != publish_proc) | 327 | if (NULL != publish_proc) |
328 | { | 328 | { |
329 | GNUNET_OS_process_kill (publish_proc, SIGKILL); | 329 | GNUNET_OS_process_kill (publish_proc, SIGKILL); |
330 | return; | 330 | return; |
331 | } | 331 | } |
332 | if (GNUNET_SCHEDULER_NO_TASK != run_task) | 332 | if (NULL != run_task) |
333 | { | 333 | { |
334 | GNUNET_SCHEDULER_cancel (run_task); | 334 | GNUNET_SCHEDULER_cancel (run_task); |
335 | run_task = GNUNET_SCHEDULER_NO_TASK; | 335 | run_task = NULL; |
336 | } | 336 | } |
337 | } | 337 | } |
338 | 338 | ||
@@ -363,7 +363,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
363 | const struct GNUNET_DISK_FileHandle *pr; | 363 | const struct GNUNET_DISK_FileHandle *pr; |
364 | 364 | ||
365 | 365 | ||
366 | run_task = GNUNET_SCHEDULER_NO_TASK; | 366 | run_task = NULL; |
367 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); | 367 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); |
368 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | 368 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) |
369 | { | 369 | { |
@@ -457,7 +457,7 @@ work (void *cls, | |||
457 | const struct GNUNET_DISK_FileHandle *pr; | 457 | const struct GNUNET_DISK_FileHandle *pr; |
458 | int argc; | 458 | int argc; |
459 | 459 | ||
460 | run_task = GNUNET_SCHEDULER_NO_TASK; | 460 | run_task = NULL; |
461 | wi = work_head; | 461 | wi = work_head; |
462 | GNUNET_CONTAINER_DLL_remove (work_head, | 462 | GNUNET_CONTAINER_DLL_remove (work_head, |
463 | work_tail, | 463 | work_tail, |
@@ -629,7 +629,7 @@ add_file (void *cls, | |||
629 | static void | 629 | static void |
630 | scan (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 630 | scan (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
631 | { | 631 | { |
632 | run_task = GNUNET_SCHEDULER_NO_TASK; | 632 | run_task = NULL; |
633 | start_time = GNUNET_TIME_absolute_get (); | 633 | start_time = GNUNET_TIME_absolute_get (); |
634 | (void) GNUNET_DISK_directory_scan (dir_name, | 634 | (void) GNUNET_DISK_directory_scan (dir_name, |
635 | &add_file, | 635 | &add_file, |