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_persistence.c | |
parent | 663cc4e8d6359a3452ee5a907cf6919cc596d5bd (diff) | |
download | gnunet-c5bb1001b8315e59f213820b16e70d501ff02aa7.tar.gz gnunet-c5bb1001b8315e59f213820b16e70d501ff02aa7.zip |
-fix fix
Diffstat (limited to 'src/fs/test_fs_search_persistence.c')
-rw-r--r-- | src/fs/test_fs_search_persistence.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 82f77d9e2..76308ecb9 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c | |||
@@ -62,6 +62,7 @@ static int err; | |||
62 | static void | 62 | static void |
63 | abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 63 | abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
64 | { | 64 | { |
65 | timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
65 | fprintf (stderr, | 66 | fprintf (stderr, |
66 | "Timeout\n"); | 67 | "Timeout\n"); |
67 | if (NULL != search) | 68 | if (NULL != search) |
@@ -80,17 +81,27 @@ abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
80 | static void | 81 | static void |
81 | abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 82 | abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
82 | { | 83 | { |
83 | GNUNET_FS_publish_stop (publish); | 84 | if (NULL != publish) |
84 | publish = NULL; | 85 | { |
86 | GNUNET_FS_publish_stop (publish); | ||
87 | publish = NULL; | ||
88 | } | ||
89 | if (GNUNET_SCHEDULER_NO_TASK != timeout_task) | ||
90 | { | ||
91 | GNUNET_SCHEDULER_cancel (timeout_task); | ||
92 | timeout_task = GNUNET_SCHEDULER_NO_TASK; | ||
93 | } | ||
85 | } | 94 | } |
86 | 95 | ||
87 | 96 | ||
88 | static void | 97 | static void |
89 | abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 98 | abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
90 | { | 99 | { |
91 | if (search != NULL) | 100 | if (NULL != search) |
101 | { | ||
92 | GNUNET_FS_search_stop (search); | 102 | GNUNET_FS_search_stop (search); |
93 | search = NULL; | 103 | search = NULL; |
104 | } | ||
94 | } | 105 | } |
95 | 106 | ||
96 | 107 | ||