aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_dirmetascan.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs/fs_dirmetascan.c')
-rw-r--r--src/fs/fs_dirmetascan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index 83e436b16..2477aab4b 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -80,7 +80,7 @@ struct GNUNET_FS_DirScanner
80 /** 80 /**
81 * Task scheduled when we are done. 81 * Task scheduled when we are done.
82 */ 82 */
83 GNUNET_SCHEDULER_TaskIdentifier stop_task; 83 struct GNUNET_SCHEDULER_Task * stop_task;
84 84
85 /** 85 /**
86 * Arguments for helper. 86 * Arguments for helper.
@@ -106,7 +106,7 @@ GNUNET_FS_directory_scan_abort (struct GNUNET_FS_DirScanner *ds)
106 /* free resources */ 106 /* free resources */
107 if (NULL != ds->toplevel) 107 if (NULL != ds->toplevel)
108 GNUNET_FS_share_tree_free (ds->toplevel); 108 GNUNET_FS_share_tree_free (ds->toplevel);
109 if (GNUNET_SCHEDULER_NO_TASK != ds->stop_task) 109 if (NULL != ds->stop_task)
110 GNUNET_SCHEDULER_cancel (ds->stop_task); 110 GNUNET_SCHEDULER_cancel (ds->stop_task);
111 GNUNET_free_non_null (ds->ex_arg); 111 GNUNET_free_non_null (ds->ex_arg);
112 GNUNET_free (ds->filename_expanded); 112 GNUNET_free (ds->filename_expanded);
@@ -230,7 +230,7 @@ finish_scan (void *cls,
230{ 230{
231 struct GNUNET_FS_DirScanner *ds = cls; 231 struct GNUNET_FS_DirScanner *ds = cls;
232 232
233 ds->stop_task = GNUNET_SCHEDULER_NO_TASK; 233 ds->stop_task = NULL;
234 if (NULL != ds->helper) 234 if (NULL != ds->helper)
235 { 235 {
236 GNUNET_HELPER_stop (ds->helper, GNUNET_NO); 236 GNUNET_HELPER_stop (ds->helper, GNUNET_NO);
@@ -427,7 +427,7 @@ helper_died_cb (void *cls)
427 struct GNUNET_FS_DirScanner *ds = cls; 427 struct GNUNET_FS_DirScanner *ds = cls;
428 428
429 ds->helper = NULL; 429 ds->helper = NULL;
430 if (GNUNET_SCHEDULER_NO_TASK != ds->stop_task) 430 if (NULL != ds->stop_task)
431 return; /* normal death, was finished */ 431 return; /* normal death, was finished */
432 ds->progress_callback (ds->progress_callback_cls, 432 ds->progress_callback (ds->progress_callback_cls,
433 NULL, GNUNET_SYSERR, 433 NULL, GNUNET_SYSERR,