guix-env: some update.

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

diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index 9ac8cf4ea936c76726e6063dcad61b32a3e16dcd..559c4abd9268946c5e4a179c56d0603dcc725c6a 100644 (file)
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2012 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008--2013 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.
  */
 
 /**
@@ -52,7 +52,7 @@ struct TestRunContext
    * Closure for the above callback
    */
   void *cc_cls;
-  
+
   /**
    * event mask for the controller callback
    */
@@ -79,8 +79,8 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
   struct TestRunContext *rc = cls;
 
-  GNUNET_TESTBED_run (NULL, config, rc->num_peers, rc->event_mask,
-                      rc->cc, rc->cc_cls, rc->test_master, rc->test_master_cls);
+  GNUNET_TESTBED_run (NULL, config, rc->num_peers, rc->event_mask, rc->cc,
+                      rc->cc_cls, rc->test_master, rc->test_master_cls);
 }
 
 
@@ -114,10 +114,12 @@ run (void *cls, char *const *args, const char *cfgfile,
  *        handle of each peer
  * @param cc_cls closure for cc
  * @param test_master task to run once the test is ready
- * @param test_master_cls closure for 'task'.
+ * @param test_master_cls closure for @a test_master
+ * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
  */
 int
-GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename,
+GNUNET_TESTBED_test_run (const char *testname,
+                         const char *cfg_filename,
                          unsigned int num_peers,
                          uint64_t event_mask,
                          GNUNET_TESTBED_ControllerCallback cc,