X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_fs_search_with_and.c;h=6583e6653c0494b7b529fc861028e2180e4ee157;hb=26d1b687ca01be01505b69ff48ae5d3e0cd4186e;hp=80cd03213a41c233ac254bbaee91f4dc5a013293;hpb=4833f5a9fe9b80de981707e517213fe22a9571c2;p=oweals%2Fgnunet.git diff --git a/src/fs/test_fs_search_with_and.c b/src/fs/test_fs_search_with_and.c index 80cd03213..6583e6653 100644 --- a/src/fs/test_fs_search_with_and.c +++ b/src/fs/test_fs_search_with_and.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2004-2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2004-2013 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 @@ -58,7 +58,7 @@ static struct GNUNET_FS_SearchContext *search; static struct GNUNET_FS_PublishContext *publish; -static GNUNET_SCHEDULER_TaskIdentifier timeout_task; +static struct GNUNET_SCHEDULER_Task * timeout_task; static int err; @@ -73,10 +73,10 @@ abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_FS_publish_stop (publish); publish = NULL; } - if (GNUNET_SCHEDULER_NO_TASK != timeout_task) + if (NULL != timeout_task) { GNUNET_SCHEDULER_cancel (timeout_task); - timeout_task = GNUNET_SCHEDULER_NO_TASK; + timeout_task = NULL; } } @@ -86,7 +86,7 @@ abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { fprintf (stderr, "Timeout\n"); - timeout_task = GNUNET_SCHEDULER_NO_TASK; + timeout_task = NULL; if (NULL != search) { GNUNET_FS_search_stop (search);