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

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

diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c
index 79208636f212fed3bf9db2c0f1b7120df5210eb9..4c1bd3057e0e737de372f2f2d02896a4f0865d8c 100644 (file)
--- a/src/dht/dht_test_lib.c
+++ b/src/dht/dht_test_lib.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 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
@@ -118,7 +118,8 @@ dht_connect_cb (void *cls,
 
   if (NULL != emsg)
   {
-    fprintf (stderr, "Failed to connect to DHT service: %s\n",
+    fprintf (stderr,
+             "Failed to connect to DHT service: %s\n",
             emsg);
     GNUNET_SCHEDULER_shutdown ();
     return;
@@ -134,7 +135,7 @@ dht_connect_cb (void *cls,
                 ctx,
                 ctx->num_peers,
                 ctx->peers,
-                ctx->dhts);            
+                ctx->dhts);
 }
 
 
@@ -203,8 +204,10 @@ GNUNET_DHT_TEST_run (const char *testname,
 
   ctx = GNUNET_new (struct GNUNET_DHT_TEST_Context);
   ctx->num_peers = num_peers;
-  ctx->ops = GNUNET_malloc (num_peers * sizeof (struct GNUNET_TESTBED_Operation *));
-  ctx->dhts = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_Handle *));
+  ctx->ops = GNUNET_new_array (num_peers,
+                               struct GNUNET_TESTBED_Operation *);
+  ctx->dhts = GNUNET_new_array (num_peers,
+                                struct GNUNET_DHT_Handle *);
   ctx->app_main = tmain;
   ctx->app_main_cls = tmain_cls;
   (void) GNUNET_TESTBED_test_run (testname,