projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #3704
[oweals/gnunet.git]
/
src
/
fs
/
fs_dirmetascan.c
diff --git
a/src/fs/fs_dirmetascan.c
b/src/fs/fs_dirmetascan.c
index 3b3615f65751bfb123d4dce6ca4ac2440a98814b..f7eb20eb7b5ca057543044f42aef775edb5b18bc 100644
(file)
--- a/
src/fs/fs_dirmetascan.c
+++ b/
src/fs/fs_dirmetascan.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet
/*
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
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.
*/
/**
* Task scheduled when we are done.
*/
-
GNUNET_SCHEDULER_TaskIdentifier
stop_task;
+
struct GNUNET_SCHEDULER_Task *
stop_task;
/**
* Arguments for helper.
/**
* 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);
/* 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);
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;
{
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);
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;
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,
return; /* normal death, was finished */
ds->progress_callback (ds->progress_callback_cls,
NULL, GNUNET_SYSERR,
@@
-463,7
+463,7
@@
GNUNET_FS_directory_scan_start (const char *filename,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting to scan directory `%s'\n",
filename_expanded);
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;
ds->progress_callback = cb;
ds->progress_callback_cls = cb_cls;
ds->filename_expanded = filename_expanded;