merchant

commit 17f156abb47e11c53a0d4c8eacfdbfeb3a399dfb
parent 2df6e15bfd8e7ddd30584347600daee9527935bb
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 25 Nov 2021 23:13:11 +0100

fix #7104

Diffstat:
M
src/backend/taler-merchant-httpd_post-orders-ID-pay.c
 | 
2
+-
M
src/lib/merchant_api_post_order_pay.c
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -933,7 +933,7 @@ deposit_cb (void *cls,
           resume_pay_with_error (pc,
                                  MHD_HTTP_INTERNAL_SERVER_ERROR,
                                  TALER_EC_GENERIC_DB_STORE_FAILED,
-                                 "deposit");
+                                 "insert_deposit");
           return;
         }
       }
diff --git a/src/lib/merchant_api_post_order_pay.c b/src/lib/merchant_api_post_order_pay.c
@@ -172,7 +172,7 @@ check_coin_history (const struct TALER_MERCHANT_PaidCoin *pc,
  *        exchange/merchant
  * @return #GNUNET_OK if proof checks out
  */
-static int
+static enum GNUNET_GenericReturnValue
 check_conflict (struct TALER_MERCHANT_OrderPayHandle *oph,
                 const json_t *json)
 {