X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ffs_dirmetascan.c;h=f7eb20eb7b5ca057543044f42aef775edb5b18bc;hb=6da7b6a2dc5ec3645d5f8bdbd4ab77d6090b823f;hp=83e436b168cc8ba67311dc8e8f4a0992ccfaed42;hpb=e0ca7357cd0bfedc5c29cb731b56279fef8da059;p=oweals%2Fgnunet.git diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c index 83e436b16..f7eb20eb7 100644 --- a/src/fs/fs_dirmetascan.c +++ b/src/fs/fs_dirmetascan.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - (C) 2005-2012 Christian Grothoff (and other contributing authors) + Copyright (C) 2005-2012 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -80,7 +80,7 @@ struct GNUNET_FS_DirScanner /** * Task scheduled when we are done. */ - GNUNET_SCHEDULER_TaskIdentifier stop_task; + struct GNUNET_SCHEDULER_Task * stop_task; /** * Arguments for helper. @@ -106,7 +106,7 @@ GNUNET_FS_directory_scan_abort (struct GNUNET_FS_DirScanner *ds) /* free resources */ if (NULL != ds->toplevel) GNUNET_FS_share_tree_free (ds->toplevel); - if (GNUNET_SCHEDULER_NO_TASK != ds->stop_task) + if (NULL != ds->stop_task) GNUNET_SCHEDULER_cancel (ds->stop_task); GNUNET_free_non_null (ds->ex_arg); GNUNET_free (ds->filename_expanded); @@ -230,7 +230,7 @@ finish_scan (void *cls, { struct GNUNET_FS_DirScanner *ds = cls; - ds->stop_task = GNUNET_SCHEDULER_NO_TASK; + ds->stop_task = NULL; if (NULL != ds->helper) { GNUNET_HELPER_stop (ds->helper, GNUNET_NO); @@ -427,7 +427,7 @@ helper_died_cb (void *cls) struct GNUNET_FS_DirScanner *ds = cls; ds->helper = NULL; - if (GNUNET_SCHEDULER_NO_TASK != ds->stop_task) + if (NULL != ds->stop_task) return; /* normal death, was finished */ ds->progress_callback (ds->progress_callback_cls, NULL, GNUNET_SYSERR,