[GNUnet-SVN] [gnunet] branch master updated: fix test_dht_montior abortion

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 32610d5d9 fix test_dht_montior abortion
32610d5d9 is described below

commit 32610d5d9238ab3f31f8fc6494d9cc0b5d18d290
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Feb 22 13:48:23 2017 +0100

    fix test_dht_montior abortion
---
 src/dht/test_dht_monitor.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c
index 223488b0f..a175890f0 100644
--- 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,12 +107,12 @@ 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_TestContext`
  */
 static void
 shutdown_task (void *cls)
 {
-  struct GNUNET_DHT_TEST_Context *ctx = cls;
+  struct GNUNET_DHT_TestContext *ctx = cls;
   unsigned int i;
   struct GetOperation *get_op;
 
@@ -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 ();
@@ -412,8 +412,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);
 }

-- 
To stop receiving notification emails like this one, please contact
address@hidden