diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-03-29 14:36:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-03-29 14:36:18 +0000 |
commit | c5bb1001b8315e59f213820b16e70d501ff02aa7 (patch) | |
tree | f95c7a8244f3a2b07a3c9de41016f6f671f7762b /src/fs/test_fs_search.c | |
parent | 663cc4e8d6359a3452ee5a907cf6919cc596d5bd (diff) | |
download | gnunet-c5bb1001b8315e59f213820b16e70d501ff02aa7.tar.gz gnunet-c5bb1001b8315e59f213820b16e70d501ff02aa7.zip |
-fix fix
Diffstat (limited to 'src/fs/test_fs_search.c')
-rw-r--r-- | src/fs/test_fs_search.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index 186365fdb..5103b6065 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c | |||
@@ -59,11 +59,17 @@ static int err; | |||
59 | 59 | ||
60 | static void | 60 | static void |
61 | abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 61 | abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
62 | { | 62 | { |
63 | GNUNET_FS_publish_stop (publish); | 63 | if (NULL != publish) |
64 | publish = NULL; | 64 | { |
65 | GNUNET_SCHEDULER_cancel (timeout_task); | 65 | GNUNET_FS_publish_stop (publish); |
66 | timeout_task = GNUNET_SCHEDULER_NO_TASK; | 66 | publish = NULL; |
67 | } | ||
68 | if (GNUNET_SCHEDULER_NO_TASK != timeout_task) | ||
69 | { | ||
70 | GNUNET_SCHEDULER_cancel (timeout_task); | ||
71 | timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
72 | } | ||
67 | } | 73 | } |
68 | 74 | ||
69 | 75 | ||
@@ -72,6 +78,7 @@ abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
72 | { | 78 | { |
73 | fprintf (stderr, | 79 | fprintf (stderr, |
74 | "Timeout\n"); | 80 | "Timeout\n"); |
81 | timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
75 | if (NULL != search) | 82 | if (NULL != search) |
76 | { | 83 | { |
77 | GNUNET_FS_search_stop (search); | 84 | GNUNET_FS_search_stop (search); |