- doxygen

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index 437d0d655eeb9245e14b4aab6e6d024c0d0c764f..9b92d485677186f258a863b870f79d8b571a428b 100644 (file)
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -524,10 +524,10 @@ GNUNET_TESTBED_controller_configure_sharing (struct GNUNET_TESTBED_Controller *c
  * controllers dependent on this controller).  This function
  * blocks until the testbed has been fully terminated (!).
  *
- * @param controller handle to controller to stop
+ * @param c handle to controller to stop
  */
 void
-GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller *controller);
+GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller *c);
 
 
 /**
@@ -911,7 +911,7 @@ GNUNET_TESTBED_peer_manage_service (void *op_cls,
  * when there are no other pending operations.  If there are pending operations,
  * it will return NULL
  *
- * @param controller the controller to send this message to
+ * @param c the controller to send this message to
  * @param op_cls closure for the operation
  * @param cb the callback to call when all peers are stopped and destroyed
  * @param cb_cls the closure for the callback
@@ -919,7 +919,7 @@ GNUNET_TESTBED_peer_manage_service (void *op_cls,
  *           present
  */
 struct GNUNET_TESTBED_Operation *
-GNUNET_TESTBED_shutdown_peers (struct GNUNET_TESTBED_Controller *controller,
+GNUNET_TESTBED_shutdown_peers (struct GNUNET_TESTBED_Controller *c,
                                void *op_cls,
                                GNUNET_TESTBED_OperationCompletionCallback cb,
                                void *cb_cls);

diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index e9a70abb38cfac135ab8d4684167c308ffa2aaad..fda47e5f8726df03e0df8097ac07f9a1784884e5 100644 (file)
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1573,7 +1573,9 @@ opc_free_iterator (void *cls, uint32_t key, void *value)
 
 
 /**
- * disconnects from the controller.
+ * Stop the given controller (also will terminate all peers and
+ * controllers dependent on this controller).  This function
+ * blocks until the testbed has been fully terminated (!).
  *
  * @param c handle to controller to stop
  */

diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index fd1df0e76361cdee0b18f384dd391fa275297f60..47d135ffd47d09532d5c44a61bd788c6a88b5156 100644 (file)
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -547,9 +547,6 @@ merge_ops (struct GNUNET_TESTBED_Operation ***old,
  * Checks for the readiness of an operation and schedules a operation start task
  *
  * @param op the operation
- * @param GNUNET_NO if the given operation cannot be made active; GNUNET_YES if
- *          it can be activated (has enough resources) and is kept in ready
- *          queue
  */
 static int
 check_readiness (struct GNUNET_TESTBED_Operation *op)