X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_fs_publish_persistence.c;h=18b17ce270232c0c9bef9ea3eeb84a4b5f159683;hb=89c5d0047e261ed7e5fabb2e771123f1707e4670;hp=8e5e5f53bfbe7d500426a37a515a4bfc5e342a8d;hpb=cd67a970afe36e8a2aa99e48cbe103cc4cc26424;p=oweals%2Fgnunet.git diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 8e5e5f53b..18b17ce27 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c @@ -1,6 +1,6 @@ /* 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 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 @@ -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 - 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. */ /** * @file fs/test_fs_publish_persistence.c @@ -60,7 +60,7 @@ static char *fn2; static int err; -static GNUNET_SCHEDULER_TaskIdentifier rtask; +static struct GNUNET_SCHEDULER_Task * rtask; static void @@ -76,10 +76,10 @@ abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) fn2 = NULL; GNUNET_FS_stop (fs); fs = NULL; - if (GNUNET_SCHEDULER_NO_TASK != rtask) + if (NULL != rtask) { GNUNET_SCHEDULER_cancel (rtask); - rtask = GNUNET_SCHEDULER_NO_TASK; + rtask = NULL; } } @@ -91,7 +91,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event); static void restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - rtask = GNUNET_SCHEDULER_NO_TASK; + rtask = NULL; GNUNET_FS_stop (fs); fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence", &progress_cb, NULL,