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

3 files changed, 8 insertions, 20 deletions

diff --git a/src/testing/.gitignore b/src/testing/.gitignore
index f350da1f2..d75315c79 100644
--- a/src/testing/.gitignore
+++ b/src/testing/.gitignore
@@ -5,3 +5,4 @@ test_testing_peerstartup2
 test_testing_portreservation
 test_testing_servicestartup
 test_testing_sharedservices
+gnunet-cmds-helper
diff --git a/src/testing/testing.c b/src/testing/testing.c
index f2482e6f3..4f0b8eaa9 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -1319,7 +1319,7 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
   peer->nports = nports;
   return peer;
 
-  err_ret:
+err_ret:
   GNUNET_free (ss_instances);
   GNUNET_free (ports);
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", emsg_);
@@ -2293,17 +2293,11 @@ GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology)
   GNUNET_free (topology);
 }
 
-/**
- * Calculate the unique id identifying a node from a given connction.
- *
- * @param node_connection The connection we calculate the id from.
- * @param topology The topology we get all needed information from.
- * @return The unique id of the node from the connection.
- */
+
 unsigned int
-GNUNET_TESTING_calculate_num (struct
-                              GNUNET_TESTING_NodeConnection *node_connection,
-                              struct GNUNET_TESTING_NetjailTopology *topology)
+GNUNET_TESTING_calculate_num (
+  struct GNUNET_TESTING_NodeConnection *node_connection,
+  struct GNUNET_TESTING_NetjailTopology *topology)
 {
   unsigned int n, m, num;
 
@@ -2751,7 +2745,7 @@ GNUNET_TESTING_get_topo_from_file (const char *filename)
   }
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "file lenght %lu\n",
+       "file length %lu\n",
        fs);
   data[fs] = '\0';
 
diff --git a/src/testing/testing_api_loop.c b/src/testing/testing_api_loop.c
index 95d6b88e6..283284f26 100644
--- a/src/testing/testing_api_loop.c
+++ b/src/testing/testing_api_loop.c
@@ -189,14 +189,6 @@ GNUNET_TESTING_interpreter_lookup_command (
 }
 
 
-/**
- * Lookup command by label.
- * All commands, first into the past, then into the furture are looked up.
- *
- * @param is interpreter to lookup command in
- * @param label label of the command to lookup.
- * @return the command, if it is found, or NULL.
- */
 const struct GNUNET_TESTING_Command *
 GNUNET_TESTING_interpreter_lookup_command_all (
   struct GNUNET_TESTING_Interpreter *is,
@@ -351,6 +343,7 @@ GNUNET_TESTING_interpreter_get_current_command (
   return &is->commands[is->ip];
 }
 
+
 const char *
 GNUNET_TESTING_interpreter_get_current_label (
   struct GNUNET_TESTING_Interpreter *is)