/*
This file is part of GNUnet
- (C) 2005-2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2005-2012 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
/**
* Task scheduled when we are done.
*/
- GNUNET_SCHEDULER_TaskIdentifier stop_task;
+ struct GNUNET_SCHEDULER_Task * stop_task;
/**
* Arguments for helper.
};
-
/**
* Abort the scan. Must not be called from within the progress_callback
* function.
/* 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);
struct GNUNET_FS_ShareTreeItem *chld;
size_t slen;
- chld = GNUNET_malloc (sizeof (struct GNUNET_FS_ShareTreeItem));
+ chld = GNUNET_new (struct GNUNET_FS_ShareTreeItem);
chld->parent = parent;
chld->filename = GNUNET_strdup (filename);
GNUNET_asprintf (&chld->short_filename,
* Task run last to shut everything down.
*
* @param cls the 'struct GNUNET_FS_DirScanner'
- * @param tc unused
*/
static void
-finish_scan (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+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);
* Calls the scanner progress handler.
*
* @param cls the closure (directory scanner object)
- * @param client always NULL
* @param msg message from the helper process
*/
static int
process_helper_msgs (void *cls,
- void *client,
const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_FS_DirScanner *ds = 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,
* Start a directory scanner thread.
*
* @param filename name of the directory to scan
- * @param disable_extractor #GNUNET_YES to not to run libextractor on files (only build a tree)
+ * @param disable_extractor #GNUNET_YES to not run libextractor on files (only
+ * build a tree)
* @param ex if not NULL, must be a list of extra plugins for extractor
* @param cb the callback to call when there are scanning progress messages
* @param cb_cls closure for 'cb'
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting to scan directory `%s'\n",
filename_expanded);
- ds = GNUNET_malloc (sizeof (struct GNUNET_FS_DirScanner));
+ ds = GNUNET_new (struct GNUNET_FS_DirScanner);
ds->progress_callback = cb;
ds->progress_callback_cls = cb_cls;
ds->filename_expanded = filename_expanded;