summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-11-25 23:13:11 +0100
committerChristian Grothoff <christian@grothoff.org>2021-11-25 23:13:11 +0100
commit17f156abb47e11c53a0d4c8eacfdbfeb3a399dfb (patch)
tree893b985de8e3f6b6b7fa11b44a1aaafdcda27965
parent2df6e15bfd8e7ddd30584347600daee9527935bb (diff)
downloadmerchant-17f156abb47e11c53a0d4c8eacfdbfeb3a399dfb.tar.gz
merchant-17f156abb47e11c53a0d4c8eacfdbfeb3a399dfb.tar.bz2
merchant-17f156abb47e11c53a0d4c8eacfdbfeb3a399dfb.zip
fix #7104
-rw-r--r--src/backend/taler-merchant-httpd_post-orders-ID-pay.c2
-rw-r--r--src/lib/merchant_api_post_order_pay.c2
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
index d1ed63fd..d9eb723e 100644
--- 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
index 158fa322..d053c856 100644
--- 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)
{