diff options
| -rw-r--r-- | src/backend/taler-merchant-httpd_post-tips-ID-pickup.c | 5 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-transfers.c | 5 | ||||
| -rw-r--r-- | src/merchant-tools/taler-merchant-setup-reserve.c | 14 |
3 files changed, 16 insertions, 8 deletions
diff --git a/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c b/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c index 729a07f1..5171347b 100644 --- a/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c +++ b/src/backend/taler-merchant-httpd_post-tips-ID-pickup.c @@ -472,8 +472,9 @@ compute_total_requested (void *cls, TMH_trigger_daemon (); /* we resumed, kick MHD */ return; } - TALER_amount_get_zero (TMH_currency, - &pc->total_requested); + GNUNET_assert (GNUNET_OK == + TALER_amount_get_zero (TMH_currency, + &pc->total_requested)); for (unsigned int i = 0; i<pc->planchets_length; i++) { struct TALER_PlanchetDetail *pd = &pc->planchets[i]; diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c b/src/backend/taler-merchant-httpd_private-post-transfers.c index 34c32d16..0433059e 100644 --- a/src/backend/taler-merchant-httpd_private-post-transfers.c +++ b/src/backend/taler-merchant-httpd_private-post-transfers.c @@ -711,8 +711,9 @@ transfer_summary_cb (void *cls, struct Entry *current_entry; struct GNUNET_HashCode h_key; - GNUNET_CRYPTO_hash_from_string (order_id, - &h_key); + GNUNET_CRYPTO_hash (order_id, + strlen (order_id), + &h_key); current_entry = GNUNET_CONTAINER_multihashmap_get (map, &h_key); if (NULL != current_entry) diff --git a/src/merchant-tools/taler-merchant-setup-reserve.c b/src/merchant-tools/taler-merchant-setup-reserve.c index f75b8cca..36c6d014 100644 --- a/src/merchant-tools/taler-merchant-setup-reserve.c +++ b/src/merchant-tools/taler-merchant-setup-reserve.c @@ -202,8 +202,14 @@ run (void *cls, "%s: %s", MHD_HTTP_HEADER_AUTHORIZATION, apikey); - GNUNET_CURL_append_header (ctx, - auth_header); + if (GNUNET_OK != + GNUNET_CURL_append_header (ctx, + auth_header)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed so sett %s header, trying without\n", + MHD_HTTP_HEADER_AUTHORIZATION); + } GNUNET_free (auth_header); } @@ -220,8 +226,8 @@ run (void *cls, NULL); if (NULL == prh) { - fprintf (stderr, - "Failed to begin operation!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to begin operation with merchant backend!\n"); global_ret = 2; GNUNET_SCHEDULER_shutdown (); return; |