projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Suffix Extensions in Makefiles (doc, src/{arm,dht,integration,statistics}) for...
[oweals/gnunet.git]
/
src
/
fs
/
test_fs_search_persistence.c
diff --git
a/src/fs/test_fs_search_persistence.c
b/src/fs/test_fs_search_persistence.c
index 38b350d22faea3ca2e37832f71168c287f1e7bbf..db084446e4ffb46f73a287da22d00e718d66a5f8 100644
(file)
--- a/
src/fs/test_fs_search_persistence.c
+++ b/
src/fs/test_fs_search_persistence.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- Copyright (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.
*/
/**
* @file fs/test_fs_search_persistence.c
*/
/**
* @file fs/test_fs_search_persistence.c
@@
-60,7
+60,7
@@
static int err;
static void
static void
-abort_error (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+abort_error (void *cls)
{
timeout_task = NULL;
fprintf (stderr,
{
timeout_task = NULL;
fprintf (stderr,
@@
-78,8
+78,9
@@
abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
err = 1;
}
err = 1;
}
+
static void
static void
-abort_publish_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+abort_publish_task (void *cls)
{
if (NULL != publish)
{
{
if (NULL != publish)
{
@@
-95,7
+96,7
@@
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
static void
-abort_search_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+abort_search_task (void *cls)
{
if (NULL != search)
{
{
if (NULL != search)
{
@@
-110,7
+111,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_FS_stop (fs);
fs = GNUNET_FS_start (cfg, "test-fs-search-persistence", &progress_cb, NULL,
{
GNUNET_FS_stop (fs);
fs = GNUNET_FS_start (cfg, "test-fs-search-persistence", &progress_cb, NULL,
@@
-183,21
+184,18
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
* search result since we exit here after the first one... */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Search complete.\n");
* search result since we exit here after the first one... */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Search complete.\n");
- GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_search_task, NULL);
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
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_SEARCH_ERROR:
FPRINTF (stderr, "Error searching file: %s\n",
event->value.search.specifics.error.message);
break;
case GNUNET_FS_STATUS_SEARCH_ERROR:
FPRINTF (stderr, "Error searching file: %s\n",
event->value.search.specifics.error.message);
- GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_search_task, NULL);
break;
case GNUNET_FS_STATUS_SEARCH_SUSPEND:
if (event->value.search.sc == search)
break;
case GNUNET_FS_STATUS_SEARCH_SUSPEND:
if (event->value.search.sc == search)
@@
-235,8
+233,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
break;
case GNUNET_FS_STATUS_SEARCH_STOPPED:
GNUNET_assert (search == event->value.search.sc);
break;
case GNUNET_FS_STATUS_SEARCH_STOPPED:
GNUNET_assert (search == event->value.search.sc);
- GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
search = NULL;
break;
default:
search = NULL;
break;
default: