-fix conflict

6 files changed, 5 insertions, 8 deletions

diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index 1b711cf40..c88ce776e 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -186,7 +186,7 @@ lookup_with_public_key (struct GNUNET_GNS_LookupWithTldRequest *ltr,
  * @param cls a `struct GNUNET_GNS_LookupWithTldRequest *`
  * @param ego ego handle, NULL at the end of the iteration
  * @param ctx context we could store data to associate with @e ego
- * @param name name of the ego
+ * @param ego_name name of the ego
  */
 static void
 identity_zone_cb (void *cls,
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index a834c5c19..312fde293 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -3429,7 +3429,6 @@ do_s5r_read (void *cls)
  * Accept new incoming connections
  *
  * @param cls the closure with the lsock4 or lsock6
- * @param tc the scheduler context
  */
 static void
 do_accept (void *cls)
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index b28236fed..6a11ec2ce 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -412,8 +412,7 @@ check_lookup (void *cls,
  * Handle lookup requests from client
  *
  * @param cls the closure
- * @param client the client
- * @param message the message
+ * @param sh_msg the message
  */
 static void
 handle_lookup (void *cls,
diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c
index 77b4340ee..ff34cedd5 100644
--- a/src/gns/nss/nss_gns.c
+++ b/src/gns/nss/nss_gns.c
@@ -193,7 +193,7 @@ finish:
  * @param result the result hostent
  * @param buffer the result buffer
  * @param buflen length of the buffer
- * @param errnop[out] the low-level error code to return to the application
+ * @param[out] errnop the low-level error code to return to the application
  * @param h_errnop idk
  * @return a nss_status code
  */
@@ -225,7 +225,7 @@ _nss_gns_gethostbyname_r (const char *name,
  * @param result the result hostent
  * @param buffer the result buffer
  * @param buflen length of the buffer
- * @param errnop[out] the low-level error code to return to the application
+ * @param[out] errnop the low-level error code to return to the application
  * @param h_errnop idk
  * @return NSS_STATUS_UNAVAIL
  */
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index a683ecacc..75e182092 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -133,7 +133,6 @@ block_plugin_gns_get_key (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)
diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c
index 3a35c9999..659b77493 100644
--- a/src/gns/plugin_rest_gns.c
+++ b/src/gns/plugin_rest_gns.c
@@ -159,7 +159,7 @@ static struct RequestHandle *requests_tail;
 
 /**
  * Cleanup lookup handle
- * @param handle Handle to clean up
+ * @param cls `struct RequestHandle` to clean up
  */
 static void
 cleanup_handle (void *cls)