-more datacache integration work

[oweals/gnunet.git] / src / testbed / test_testbed_api_statistics.c

diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c
index e0f48fcb511dc91de633ac2e9ce8cfbd2e40e11d..e0e8ab42eff70d20704b7767e09aaf34f2b90658 100644 (file)
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2013 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008--2013 Christian Grothoff (and other contributing authors)
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -21,11 +21,11 @@
 /**
  * @file testbed/test_testbed_api_statistics.c
  * @brief testcase for testing GNUNET_TESTBED_get_statistics() implementation
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 
 /**
@@ -51,7 +51,7 @@ static void *dummy_cls = (void *) 0xDEAD0001;
 /**
  * Abort task identifier
  */
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static struct GNUNET_SCHEDULER_Task * abort_task;
 
 /**
  * Global testing result
@@ -75,7 +75,7 @@ static unsigned int num_seen_peers;
 #define FAIL_TEST(cond, ret) do {                               \
     if (!(cond)) {                                              \
       GNUNET_break(0);                                          \
-      if (GNUNET_SCHEDULER_NO_TASK != abort_task)               \
+      if (NULL != abort_task)               \
         GNUNET_SCHEDULER_cancel (abort_task);                   \
       abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);  \
       ret;                                                      \
@@ -93,9 +93,9 @@ static void
 do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test timed out -- Aborting\n");
-  abort_task = GNUNET_SCHEDULER_NO_TASK;
+  abort_task = NULL;
   if (NULL != op)
-  {  
+  {
     GNUNET_TESTBED_operation_done (op);
     op = NULL;
   }
@@ -121,12 +121,12 @@ stats_iterator (void *cls,
                 int is_persistent)
 {
   unsigned int cnt;
-    
+
   FAIL_TEST (cls == dummy_cls, return GNUNET_SYSERR);
   for (cnt = 0; cnt < num_seen_peers; cnt++)
     FAIL_TEST (peer != seen_peers[cnt], return GNUNET_SYSERR);
   FAIL_TEST (NULL != subsystem, return GNUNET_SYSERR);
-  FAIL_TEST (NULL != name, return GNUNET_SYSERR);  
+  FAIL_TEST (NULL != name, return GNUNET_SYSERR);
   GNUNET_array_append (seen_peers, num_seen_peers,
                        (struct GNUNET_TESTBED_Peer *) peer);
   return GNUNET_SYSERR;
@@ -151,7 +151,7 @@ op_comp_cb (void *cls,
   GNUNET_TESTBED_operation_done (op);
   op = NULL;
   GNUNET_SCHEDULER_cancel (abort_task);
-  GNUNET_SCHEDULER_shutdown ();  
+  GNUNET_SCHEDULER_shutdown ();
 }