summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-12-09 23:47:30 +0100
committerChristian Grothoff <christian@grothoff.org>2017-12-09 23:47:30 +0100
commit1a59edadbcaedc35dcc2b4d5409e131630b67af6 (patch)
tree54d1334ece636ab48f0852a15b8e0b40d319d94d
parent9be3e281ada8df010b163d2d85f8793dd7fc548a (diff)
downloadmerchant-1a59edadbcaedc35dcc2b4d5409e131630b67af6.tar.gz
merchant-1a59edadbcaedc35dcc2b4d5409e131630b67af6.tar.bz2
merchant-1a59edadbcaedc35dcc2b4d5409e131630b67af6.zip
fix enum confusion
-rw-r--r--src/backend/taler-merchant-httpd_pay.c1
-rw-r--r--src/backenddb/plugin_merchantdb_postgres.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c
index 0d0f9e22..ff8d59cc 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -735,6 +735,7 @@ process_pay_with_exchange (void *cls,
}
/* Total up the fees and the value of the deposited coins! */
+ GNUNET_assert (0 != pc->coins_cnt);
for (unsigned int i=0;i<pc->coins_cnt;i++)
{
struct DepositConfirmation *dc = &pc->dc[i];
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 835f2e68..cb1d9c6f 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -3021,12 +3021,12 @@ postgres_pickup_tip (void *cls,
check_connection (pg);
RETRY:
if (MAX_RETRIES < ++retries)
- return GNUNET_DB_STATUS_SOFT_ERROR;
+ return TALER_EC_TIP_PICKUP_DB_ERROR_SOFT;
if (GNUNET_OK !=
postgres_start (pg))
{
GNUNET_break (0);
- return GNUNET_DB_STATUS_HARD_ERROR;
+ return TALER_EC_TIP_PICKUP_DB_ERROR_HARD;
}
qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
"lookup_reserve_by_tip_id",