-fix off-by-1

[oweals/gnunet.git] / src / statistics / statistics_api.c

diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index 49c12de5988a442cf0f2918bc9ab9294632fadae..32b973eeccfe8af5ab306a6a7ee536c018af0625 100644 (file)
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010, 2011 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -462,11 +462,9 @@ try_connect (struct GNUNET_STATISTICS_Handle *h)
  * We've waited long enough, reconnect now.
  *
  * @param cls the `struct GNUNET_STATISTICS_Handle` to reconnect
- * @param tc scheduler context (unused)
  */
 static void
-reconnect_task (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect_task (void *cls)
 {
   struct GNUNET_STATISTICS_Handle *h = cls;
 
@@ -479,11 +477,9 @@ reconnect_task (void *cls,
  * Task used by 'reconnect_later' to shutdown the handle
  *
  * @param cls the statistics handle
- * @param tc scheduler context
  */
 static void
-do_destroy (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_destroy (void *cls)
 {
   struct GNUNET_STATISTICS_Handle *h = cls;
 
@@ -518,8 +514,7 @@ reconnect_later (struct GNUNET_STATISTICS_Handle *h)
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                  _("Could not save some persistent statistics\n"));
     h->do_destroy = GNUNET_NO;
-    GNUNET_SCHEDULER_add_continuation (&do_destroy, h,
-                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (&do_destroy, h);
     return;
   }
   h->backoff_task =
@@ -628,11 +623,9 @@ process_watch_value (struct GNUNET_STATISTICS_Handle *h,
  * Task used to destroy the statistics handle.
  *
  * @param cls the `struct GNUNET_STATISTICS_Handle`
- * @param tc the scheduler context
  */
 static void
-destroy_task (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+destroy_task (void *cls)
 {
   struct GNUNET_STATISTICS_Handle *h = cls;
 
@@ -674,8 +667,7 @@ receive_stats (void *cls,
       return;
     }
     h->do_destroy = GNUNET_NO;
-    GNUNET_SCHEDULER_add_continuation (&destroy_task, h,
-                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (&destroy_task, h);
     break;
   case GNUNET_MESSAGE_TYPE_STATISTICS_END:
     LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -1089,8 +1081,7 @@ transmit_test_on_shutdown (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                _("Failed to receive acknowledgement from statistics service, some statistics might have been lost!\n"));
     h->do_destroy = GNUNET_NO;
-    GNUNET_SCHEDULER_add_continuation (&destroy_task, h,
-                                      GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_add_now (&destroy_task, h);
     return 0;
   }
   hdr.type = htons (GNUNET_MESSAGE_TYPE_TEST);
@@ -1162,11 +1153,9 @@ schedule_action (struct GNUNET_STATISTICS_Handle *h)
  * call the continuation.
  *
  * @param cls the `struct GNUNET_STATISTICS_GetHandle`
- * @param tc scheduler context
  */
 static void
-run_get_timeout (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_get_timeout (void *cls)
 {
   struct GNUNET_STATISTICS_GetHandle *gh = cls;
   GNUNET_STATISTICS_Callback cont = gh->cont;
@@ -1228,7 +1217,8 @@ GNUNET_STATISTICS_get (struct GNUNET_STATISTICS_Handle *handle,
   ai->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
                                                    &run_get_timeout,
                                                    ai);
-  GNUNET_CONTAINER_DLL_insert_tail (handle->action_head, handle->action_tail,
+  GNUNET_CONTAINER_DLL_insert_tail (handle->action_head,
+                                   handle->action_tail,
                                    ai);
   schedule_action (handle);
   return ai;