projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing dead/legacy server/connection logic, except for in tcp/wlan/bt plugins ...
[oweals/gnunet.git]
/
src
/
fs
/
test_fs_download_persistence.c
diff --git
a/src/fs/test_fs_download_persistence.c
b/src/fs/test_fs_download_persistence.c
index 7e1f01ae7135cc0bd3cf14097f11c0f50dedd784..76a1ea91104605963c8091460b6b77935639cee3 100644
(file)
--- a/
src/fs/test_fs_download_persistence.c
+++ b/
src/fs/test_fs_download_persistence.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2004, 2005, 2006, 2008, 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-62,7
+62,7
@@
static int err;
static void
static void
-timeout_kill_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+timeout_kill_task (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
if (download != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
if (download != NULL)
@@
-81,7
+81,7
@@
timeout_kill_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
static void
-abort_publish_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+abort_publish_task (void *cls)
{
if (publish != NULL)
{
{
if (publish != NULL)
{
@@
-92,7
+92,7
@@
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
static void
-abort_download_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+abort_download_task (void *cls)
{
uint64_t size;
{
uint64_t size;
@@
-116,7
+116,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event);
static void
static void
-restart_fs_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+restart_fs_task (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting FS.\n");
GNUNET_FS_stop (fs);
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting FS.\n");
GNUNET_FS_stop (fs);
@@
-202,8
+202,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
- GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
FPRINTF (stderr, "Error downloading file: %s\n",
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
FPRINTF (stderr, "Error downloading file: %s\n",
@@
-265,8
+264,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
GNUNET_assert (download == event->value.download.dc);
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
GNUNET_assert (download == event->value.download.dc);
- GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
download = NULL;
break;
default:
download = NULL;
break;
default: