Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / dht / test_dht_monitor.c

diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c
index 223488b0f6844835e70fc28f2a5125831fb065f5..3de8001448a0ea6b4f3a1a77fe5460bd951bfcb4 100644 (file)
--- a/src/dht/test_dht_monitor.c
+++ b/src/dht/test_dht_monitor.c
@@ -90,7 +90,7 @@ static unsigned int NUM_PEERS = 3;
 /**
  * Task called to disconnect peers.
  */
-static struct GNUNET_SCHEDULER_Task * timeout_task;
+static struct GNUNET_SCHEDULER_Task *timeout_task;
 
 /**
  * Task to do DHT_puts
@@ -107,7 +107,7 @@ static unsigned int monitor_counter;
  * Terminates active get operations and shuts down
  * the testbed.
  *
- * @param cls the 'struct GNUNET_DHT_TestContext'
+ * @param cls the `struct GNUNET_DHT_TEST_Context`
  */
 static void
 shutdown_task (void *cls)
@@ -146,10 +146,10 @@ shutdown_task (void *cls)
  * Terminates active get operations and shuts down
  * the testbed.
  *
- * @param cls the 'struct GNUNET_DHT_TestContext'
+ * @param cls NULL
  */
 static void
-timeout_task (void *cls)
+timeout_task_cb (void *cls)
 {
   timeout_task = NULL;
   GNUNET_SCHEDULER_shutdown ();
@@ -183,7 +183,6 @@ dht_get_handler (void *cls, struct GNUNET_TIME_Absolute exp,
 {
   struct GetOperation *get_op = cls;
   struct GNUNET_HashCode want;
-  struct GNUNET_DHT_TestContext *ctx;
 
   if (sizeof (struct GNUNET_HashCode) != size)
   {
@@ -412,8 +411,8 @@ run (void *cls,
     }
   }
   timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                              &timeout_task,
-                                               ctx);
+                                              &timeout_task_cb,
+                                               NULL);
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
                                  ctx);
 }