[GNUnet-SVN] r15656 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2011-06-16 13:34:16 +0200 (Thu, 16 Jun 2011)
New Revision: 15656

Modified:
   gnunet/src/core/test_core_api_preferences.c
Log:
cleaner

Modified: gnunet/src/core/test_core_api_preferences.c
===================================================================
--- gnunet/src/core/test_core_api_preferences.c 2011-06-16 11:26:01 UTC (rev 
15655)
+++ gnunet/src/core/test_core_api_preferences.c 2011-06-16 11:34:16 UTC (rev 
15656)
@@ -103,7 +103,10 @@
   if (GNUNET_SCHEDULER_NO_TASK != irc_task)
     GNUNET_SCHEDULER_cancel (irc_task);
   if (GNUNET_SCHEDULER_NO_TASK != ask_task)
-    GNUNET_SCHEDULER_cancel (ask_task);
+    {
+      GNUNET_SCHEDULER_cancel (ask_task);
+      ask_task = GNUNET_SCHEDULER_NO_TASK;
+    }
   GNUNET_CORE_disconnect (p1.ch);
   GNUNET_CORE_disconnect (p2.ch);
   GNUNET_TRANSPORT_disconnect (p1.th);
@@ -233,8 +236,11 @@
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Encrypted connection established to peer `%4s'\n",
                  GNUNET_i2s (peer));
-      GNUNET_SCHEDULER_cancel (ask_task);
-      ask_task = GNUNET_SCHEDULER_NO_TASK;
+      if (GNUNET_SCHEDULER_NO_TASK != ask_task)
+       {
+         GNUNET_SCHEDULER_cancel (ask_task);
+         ask_task = GNUNET_SCHEDULER_NO_TASK;
+       }
       GNUNET_SCHEDULER_cancel (err_task);
       err_task = 
        GNUNET_SCHEDULER_add_delayed 
(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120), 
@@ -314,6 +320,8 @@
 ask_connect_task (void *cls,
                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  if (GNUNET_SCHEDULER_NO_TASK != ask_task)
+    GNUNET_SCHEDULER_cancel (ask_task);
   ask_task =
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
                                  &ask_connect_task, NULL);
@@ -366,6 +374,8 @@
       err_task = 
        GNUNET_SCHEDULER_add_delayed 
(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60), 
                                      &terminate_task_error, NULL);
+      if (GNUNET_SCHEDULER_NO_TASK != ask_task)
+       GNUNET_SCHEDULER_cancel (ask_task);
       ask_task =
        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
                                      &ask_connect_task, NULL);