-fix conflict

3 files changed, 9 insertions, 10 deletions

diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 4b4a76eea..4d27efb4e 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -278,7 +278,7 @@ free_queue_entry (struct GNUNET_DATASTORE_QueueEntry *qe)
 /**
  * Task that logs an error after some time.
  *
- * @param qe `struct GNUNET_DATASTORE_QueueEntry` about which the error is
+ * @param cls `struct GNUNET_DATASTORE_QueueEntry` about which the error is
  */
 static void
 delay_warning (void *cls)
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 498a7b3e6..f45e71ee9 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -560,7 +560,7 @@ transmit_item (void *cls,
  * Handle RESERVE-message.
  *
  * @param cls identification of the client
- * @param message the actual message
+ * @param msg the actual message
  */
 static void
 handle_reserve (void *cls, const struct ReserveMessage *msg)
@@ -644,7 +644,7 @@ handle_reserve (void *cls, const struct ReserveMessage *msg)
  * Handle RELEASE_RESERVE-message.
  *
  * @param cls identification of the client
- * @param message the actual message
+ * @param msg the actual message
  */
 static void
 handle_release_reserve (void *cls, const struct ReleaseReserveMessage *msg)
@@ -768,7 +768,7 @@ put_continuation (void *cls,
  * Verify PUT-message.
  *
  * @param cls identification of the client
- * @param message the actual message
+ * @param dm the actual message
  * @return #GNUNET_OK if @a dm is well-formed
  */
 static int
@@ -787,7 +787,7 @@ check_put (void *cls, const struct DataMessage *dm)
  * Handle PUT-message.
  *
  * @param cls identification of the client
- * @param message the actual message
+ * @param dm the actual message
  */
 static void
 handle_put (void *cls, const struct DataMessage *dm)
@@ -949,7 +949,7 @@ handle_get_replication (void *cls, const struct GNUNET_MessageHeader *message)
  * Handle GET_ZERO_ANONYMITY-message.
  *
  * @param cls client identification of the client
- * @param message the actual message
+ * @param msg the actual message
  */
 static void
 handle_get_zero_anonymity (void *cls, const struct GetZeroAnonymityMessage *msg)
@@ -1028,7 +1028,7 @@ remove_continuation (void *cls,
  * Verify REMOVE-message.
  *
  * @param cls identification of the client
- * @param message the actual message
+ * @param dm the actual message
  * @return #GNUNET_OK if @a dm is well-formed
  */
 static int
@@ -1047,8 +1047,7 @@ check_remove (void *cls, const struct DataMessage *dm)
  * Handle REMOVE-message.
  *
  * @param cls closure
- * @param client identification of the client
- * @param message the actual message
+ * @param dm the actual message
  */
 static void
 handle_remove (void *cls, const struct DataMessage *dm)
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 27e8b7072..e49564dd9 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -760,7 +760,7 @@ struct ProcessKeysContext
  *
  * @param cls closure with a `struct ProcessKeysContext`
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 process_keys (void *cls,