[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26652 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26652 - gnunet/src/fs |
Date: |
Fri, 29 Mar 2013 15:36:18 +0100 |
Author: grothoff
Date: 2013-03-29 15:36:18 +0100 (Fri, 29 Mar 2013)
New Revision: 26652
Modified:
gnunet/src/fs/test_fs_search.c
gnunet/src/fs/test_fs_search_persistence.c
gnunet/src/fs/test_fs_search_probes.c
Log:
-fix fix
Modified: gnunet/src/fs/test_fs_search.c
===================================================================
--- gnunet/src/fs/test_fs_search.c 2013-03-29 14:33:42 UTC (rev 26651)
+++ gnunet/src/fs/test_fs_search.c 2013-03-29 14:36:18 UTC (rev 26652)
@@ -59,11 +59,17 @@
static void
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_FS_publish_stop (publish);
- publish = NULL;
- GNUNET_SCHEDULER_cancel (timeout_task);
- timeout_task = GNUNET_SCHEDULER_NO_TASK;
+{
+ if (NULL != publish)
+ {
+ GNUNET_FS_publish_stop (publish);
+ publish = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
}
@@ -72,6 +78,7 @@
{
fprintf (stderr,
"Timeout\n");
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
if (NULL != search)
{
GNUNET_FS_search_stop (search);
Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c 2013-03-29 14:33:42 UTC (rev
26651)
+++ gnunet/src/fs/test_fs_search_persistence.c 2013-03-29 14:36:18 UTC (rev
26652)
@@ -62,6 +62,7 @@
static void
abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
fprintf (stderr,
"Timeout\n");
if (NULL != search)
@@ -80,17 +81,27 @@
static void
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_FS_publish_stop (publish);
- publish = NULL;
+ if (NULL != publish)
+ {
+ GNUNET_FS_publish_stop (publish);
+ publish = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
}
static void
abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (search != NULL)
+ if (NULL != search)
+ {
GNUNET_FS_search_stop (search);
- search = NULL;
+ search = NULL;
+ }
}
Modified: gnunet/src/fs/test_fs_search_probes.c
===================================================================
--- gnunet/src/fs/test_fs_search_probes.c 2013-03-29 14:33:42 UTC (rev
26651)
+++ gnunet/src/fs/test_fs_search_probes.c 2013-03-29 14:36:18 UTC (rev
26652)
@@ -61,6 +61,7 @@
static void
abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
fprintf (stderr,
"Timeout\n");
if (NULL != search)
@@ -80,8 +81,16 @@
static void
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_FS_publish_stop (publish);
- publish = NULL;
+ if (NULL != publish)
+ {
+ GNUNET_FS_publish_stop (publish);
+ publish = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26652 - gnunet/src/fs,
gnunet <=