[taler-merchant] branch master updated (eab97f3 -> 24e5214)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a change to branch master
in repository merchant.

    from eab97f3  try using macro to comment out legacy logic
     new d615702  @param name[out] -> @param[out] name
     new 24e5214  @param

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/backenddb/plugin_merchantdb_postgres.c | 6 +++---
 src/testing/testing_api_cmd_abort_order.c  | 5 +----
 src/testing/testing_api_cmd_claim_order.c  | 2 +-
 src/testing/testing_api_cmd_forget_order.c | 2 +-
 src/testing/testing_api_cmd_get_orders.c   | 3 ++-
 src/testing/testing_api_cmd_lock_product.c | 2 +-
 src/testing/testing_api_cmd_post_orders.c  | 4 ++--
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/backenddb/plugin_merchantdb_postgres.c 
b/src/backenddb/plugin_merchantdb_postgres.c
index 50b8f8e..19ea0ed 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -40,7 +40,7 @@
  * when fetching amounts from the database.
  *
  * @param field name of the database field to fetch amount from
- * @param amountp[out] pointer to amount to set
+ * @param[out] amountp pointer to amount to set
  */
 #define TALER_PQ_RESULT_SPEC_AMOUNT(field,amountp) \
   TALER_PQ_result_spec_amount (                    \
@@ -51,7 +51,7 @@
  * when fetching amounts from the database.  NBO variant.
  *
  * @param field name of the database field to fetch amount from
- * @param amountp[out] pointer to amount to set
+ * @param[out] amountp pointer to amount to set
  */
 #define TALER_PQ_RESULT_SPEC_AMOUNT_NBO(field, amountp) \
   TALER_PQ_result_spec_amount_nbo (                     \
@@ -63,7 +63,7 @@
  * when fetching amounts from the database.
  *
  * @param field name of the database field to fetch amount from
- * @param amountp[out] pointer to amount to set
+ * @param[out] amountp pointer to amount to set
  */
 #define TALER_PQ_RESULT_SPEC_AMOUNT(field,amountp) \
   TALER_PQ_result_spec_amount (                    \
diff --git a/src/testing/testing_api_cmd_abort_order.c 
b/src/testing/testing_api_cmd_abort_order.c
index c0c4a15..a0d4484 100644
--- a/src/testing/testing_api_cmd_abort_order.c
+++ b/src/testing/testing_api_cmd_abort_order.c
@@ -86,9 +86,6 @@ struct AbortState
  *            clobbered in the process
  * @param is interpreter state
  * @param amount_with_fee total amount to be paid for a contract.
- * @param amount_without_fee to be removed, there is no
- *        per-contract fee, only per-coin exists.
- * @param refund_fee per-contract? per-coin?
  * @return #GNUNET_OK on success
  */
 static int
@@ -385,7 +382,7 @@ abort_cleanup (void *cls,
  * Offer internal data useful to other commands.
  *
  * @param cls closure
- * @param ret[out] result (could be anything)
+ * @param[out] ret result (could be anything)
  * @param trait name of the trait
  * @param index index number of the object to extract.
  * @return #GNUNET_OK on success
diff --git a/src/testing/testing_api_cmd_claim_order.c 
b/src/testing/testing_api_cmd_claim_order.c
index 9ef18e0..3f493dc 100644
--- a/src/testing/testing_api_cmd_claim_order.c
+++ b/src/testing/testing_api_cmd_claim_order.c
@@ -249,7 +249,7 @@ order_claim_run (void *cls,
  * Offer internal data to other commands.
  *
  * @param cls closure
- * @param ret[out] result (could be anything)
+ * @param[out] ret result (could be anything)
  * @param trait name of the trait
  * @param index index number of the object to extract.
  * @return #GNUNET_OK on success
diff --git a/src/testing/testing_api_cmd_forget_order.c 
b/src/testing/testing_api_cmd_forget_order.c
index 777be58..31b24bc 100644
--- a/src/testing/testing_api_cmd_forget_order.c
+++ b/src/testing/testing_api_cmd_forget_order.c
@@ -175,7 +175,7 @@ order_forget_run (void *cls,
  * Offer internal data to other commands.
  *
  * @param cls closure
- * @param ret[out] result (could be anything)
+ * @param[out] ret result (could be anything)
  * @param trait name of the trait
  * @param index index number of the object to extract.
  * @return #GNUNET_OK on success
diff --git a/src/testing/testing_api_cmd_get_orders.c 
b/src/testing/testing_api_cmd_get_orders.c
index d61f9f5..a4dcc81 100644
--- a/src/testing/testing_api_cmd_get_orders.c
+++ b/src/testing/testing_api_cmd_get_orders.c
@@ -388,7 +388,8 @@ conclude_task (void *cls)
  *
  * @param cls closure
  * @param hr HTTP response details
- * @param osr order status response details (on success)
+ * @param orders_length how many orders are returned
+ * @param orders the returned orders
  */
 static void
 merchant_poll_orders_cb (
diff --git a/src/testing/testing_api_cmd_lock_product.c 
b/src/testing/testing_api_cmd_lock_product.c
index 198b757..a61f1bd 100644
--- a/src/testing/testing_api_cmd_lock_product.c
+++ b/src/testing/testing_api_cmd_lock_product.c
@@ -168,7 +168,7 @@ lock_product_cleanup (void *cls,
  * Offer internal data to other commands.
  *
  * @param cls closure
- * @param ret[out] result (could be anything)
+ * @param[out] ret result (could be anything)
  * @param trait name of the trait
  * @param index index number of the object to extract.
  * @return #GNUNET_OK on success
diff --git a/src/testing/testing_api_cmd_post_orders.c 
b/src/testing/testing_api_cmd_post_orders.c
index 3adcf7d..6977269 100644
--- a/src/testing/testing_api_cmd_post_orders.c
+++ b/src/testing/testing_api_cmd_post_orders.c
@@ -144,7 +144,7 @@ struct OrdersState
  * Offer internal data to other commands.
  *
  * @param cls closure
- * @param ret[out] result (could be anything)
+ * @param[out] ret result (could be anything)
  * @param trait name of the trait
  * @param index index number of the object to extract.
  * @return #GNUNET_OK on success
@@ -632,7 +632,7 @@ mark_forgettable (void *cls,
  * @param refund_deadline the deadline for refunds on this order.
  * @param pay_deadline the deadline for payment on this order.
  * @param amount the amount this order is for.
- * @param order[out] where to write the json string.
+ * @param[out] order where to write the json string.
  */
 static void
 make_order_json (const char *order_id,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.