3 files changed, 6 insertions, 9 deletions

diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c
index 46a370924..4a271fa42 100644
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -55,7 +55,7 @@
  *         by this @a type of block (this is not an error)
  */
 static struct GNUNET_BLOCK_Group *
-block_plugin_template_create_group (void *cls,
+block_plugin_template_create_group (void *ctx,
                                     enum GNUNET_BLOCK_Type type,
                                     const void *raw_data,
                                     size_t raw_data_size,
@@ -79,7 +79,7 @@ block_plugin_template_create_group (void *cls,
     bf_size = TEMPLATE_BF_SIZE;
   }
   GNUNET_break (NULL == va_arg (va, const char *));
-  return GNUNET_BLOCK_GROUP_bf_create (cls,
+  return GNUNET_BLOCK_GROUP_bf_create (ctx,
                                        bf_size,
                                        BLOOMFILTER_K,
                                        type,
@@ -92,10 +92,9 @@ block_plugin_template_create_group (void *cls,
  * Function called to validate a query.
  *
  * @param cls closure
- * @param ctx block context
  * @param type block type
  * @param query original query (hash)
- * @param xquery extrended query data (can be NULL, depending on type)
+ * @param xquery extended query data (can be NULL, depending on type)
  * @param xquery_size number of bytes in @a xquery
  * @return #GNUNET_OK if the query is fine, #GNUNET_NO if not, #GNUNET_SYSERR if not supported
  */
diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c
index 2e404bbc2..5afac9205 100644
--- a/src/block/plugin_block_test.c
+++ b/src/block/plugin_block_test.c
@@ -53,7 +53,7 @@
  *         by this @a type of block (this is not an error)
  */
 static struct GNUNET_BLOCK_Group *
-block_plugin_test_create_group (void *cls,
+block_plugin_test_create_group (void *ctx,
                                 enum GNUNET_BLOCK_Type type,
                                 const void *raw_data,
                                 size_t raw_data_size,
@@ -77,7 +77,7 @@ block_plugin_test_create_group (void *cls,
     bf_size = TEST_BF_SIZE;
   }
   GNUNET_break (NULL == va_arg (va, const char *));
-  return GNUNET_BLOCK_GROUP_bf_create (cls,
+  return GNUNET_BLOCK_GROUP_bf_create (ctx,
                                        bf_size,
                                        BLOOMFILTER_K,
                                        type,
@@ -90,10 +90,9 @@ block_plugin_test_create_group (void *cls,
  * Function called to validate a query.
  *
  * @param cls closure
- * @param ctx block context
  * @param type block type
  * @param query original query (hash)
- * @param xquery extrended query data (can be NULL, depending on type)
+ * @param xquery extended query data (can be NULL, depending on type)
  * @param xquery_size number of bytes in @a xquery
  * @return #GNUNET_OK if the query is fine, #GNUNET_NO if not, #GNUNET_SYSERR if @a type is not supported
  */
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index a9a5ec8af..6a6de712b 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -131,7 +131,6 @@ struct GNUNET_BLOCK_Group;
  *
  * @param ctx block context in which the block group is created
  * @param type type of the block for which we are creating the group
- * @param nonce random value used to seed the group creation
  * @param raw_data optional serialized prior state of the group, NULL if unavailable/fresh
  * @param raw_data_size number of bytes in @a raw_data, 0 if unavailable/fresh
  * @param ... type-specific additional data, can be empty