aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-05-01 09:59:24 +0200
committerChristian Grothoff <christian@grothoff.org>2015-05-01 09:59:24 +0200
commit8bd435d7ee73bd9cfc3265e161d5e847aac1f5ee (patch)
treea33873d0e3408ab2f02a2cbc375dc86ccbc64e58
parente4bd4aba8d057497702151cb9c72a8ad110a3c45 (diff)
downloadmerchant-8bd435d7ee73bd9cfc3265e161d5e847aac1f5ee.tar.gz
merchant-8bd435d7ee73bd9cfc3265e161d5e847aac1f5ee.zip
minor bugfixes
-rw-r--r--src/merchant/taler_merchant_serve.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/merchant/taler_merchant_serve.c b/src/merchant/taler_merchant_serve.c
index b025052c..e6d5f887 100644
--- a/src/merchant/taler_merchant_serve.c
+++ b/src/merchant/taler_merchant_serve.c
@@ -811,7 +811,10 @@ handle_get_contract (struct MHD_Connection *connection,
811 nounce = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_NONCE, UINT64_MAX); 811 nounce = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_NONCE, UINT64_MAX);
812 812
813 /* Prepare contract */ 813 /* Prepare contract */
814 GNUNET_asprintf (&desc, template, hostname, port); 814 (void) GNUNET_asprintf (&desc,
815 template,
816 hostname,
817 port);
815 contract_id = MERCHANT_DB_contract_create (db_conn, 818 contract_id = MERCHANT_DB_contract_create (db_conn,
816 expiry, 819 expiry,
817 &amount, 820 &amount,
@@ -968,7 +971,7 @@ checkout_status (void *cls, int status, json_t *obj, char *emsg)
968 char *download_page; 971 char *download_page;
969 char *location; 972 char *location;
970 struct MHD_Response *resp; 973 struct MHD_Response *resp;
971 ssize_t size; 974 int size;
972 975
973 LOG_DEBUG ("Processing checkout request reply\n"); 976 LOG_DEBUG ("Processing checkout request reply\n");
974 GNUNET_SCHEDULER_cancel (ctx->timeout_task); 977 GNUNET_SCHEDULER_cancel (ctx->timeout_task);
@@ -1385,7 +1388,7 @@ build_list_product_response ()
1385 struct Download *dwn; 1388 struct Download *dwn;
1386 size_t size; 1389 size_t size;
1387 unsigned int cnt; 1390 unsigned int cnt;
1388 unsigned int psize; 1391 int psize;
1389 unsigned int header_size; 1392 unsigned int header_size;
1390 unsigned int footer_size; 1393 unsigned int footer_size;
1391 unsigned int *partial_sizes; 1394 unsigned int *partial_sizes;