diff options
| m--------- | examples/blog/web-common | 0 | ||||
| m--------- | examples/shop/web-common | 0 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd.c | 16 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_pay.c | 10 | ||||
| -rw-r--r-- | src/lib/test_merchant_api.c | 2 |
5 files changed, 15 insertions, 13 deletions
diff --git a/examples/blog/web-common b/examples/blog/web-common -Subproject e2931f26c84cd577bba367a3e13cb5c0515c333 +Subproject 80f1e2708dbe4b19349244b611a6167b4b7a98c diff --git a/examples/shop/web-common b/examples/shop/web-common -Subproject e2931f26c84cd577bba367a3e13cb5c0515c333 +Subproject 80f1e2708dbe4b19349244b611a6167b4b7a98c diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c index ca02030a..67f81016 100644 --- a/src/backend/taler-merchant-httpd.c +++ b/src/backend/taler-merchant-httpd.c @@ -258,7 +258,7 @@ do_shutdown (void *cls) { json_decref (instances[i]->j_wire); GNUNET_free (instances[i]->id); - GNUNET_free (instances[i]); + GNUNET_free (instances[i]); } } } @@ -416,10 +416,10 @@ instances_iterator_cb (void *cls, "Failed to specify a merchant instance\n"); GNUNET_SCHEDULER_shutdown (); return; - } + } /** Get id **/ - token = strrchr (section, '-'); + token = strrchr (section, '-'); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Extracted token: %s\n", token + 1); @@ -465,8 +465,8 @@ instances_iterator_cb (void *cls, mi->j_wire = iic->plugin->get_wire_details (iic->plugin->cls, iic->config, - instance_wiresection); - GNUNET_free (instance_wiresection); + instance_wiresection); + GNUNET_free (instance_wiresection); if (GNUNET_YES != iic->plugin->wire_validate (iic->plugin->cls, mi->j_wire, @@ -548,7 +548,6 @@ iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config, iic->default_instance = GNUNET_NO; iic->plugin = GNUNET_PLUGIN_load (lib_name, NULL); - iic->plugin->library_name = lib_name; if (NULL == iic->plugin) { GNUNET_free (lib_name); @@ -557,6 +556,7 @@ iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config, allowed); return GNUNET_SYSERR; } + iic->plugin->library_name = lib_name; GNUNET_CONFIGURATION_iterate_sections (config, &instances_iterator_cb, (void *) iic); @@ -606,7 +606,7 @@ iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config, json_dumps (instances[i]->j_wire, JSON_INDENT (2)), hash, priv, - pub); + pub); GNUNET_free (hash); GNUNET_free (priv); @@ -622,7 +622,7 @@ iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config, GNUNET_free (lib_name); GNUNET_free (iic); GNUNET_SCHEDULER_shutdown (); - return GNUNET_SYSERR; + return GNUNET_SYSERR; } while (0); } diff --git a/src/backend/taler-merchant-httpd_pay.c b/src/backend/taler-merchant-httpd_pay.c index 84b8f6ae..261362c1 100644 --- a/src/backend/taler-merchant-httpd_pay.c +++ b/src/backend/taler-merchant-httpd_pay.c @@ -234,7 +234,7 @@ struct PayContext * transaction in our database. */ int transaction_exits; - + /** * Instance of the payment's receiver (in JSON format) */ @@ -650,7 +650,7 @@ process_pay_with_exchange (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exchange and fee structure OK. Initiating deposit operation for coins\n"); - + /* Initiate /deposit operation for all coins */ for (i=0;i<pc->coins_cnt;i++) @@ -662,8 +662,8 @@ process_pay_with_exchange (void *cls, GNUNET_assert (NULL != pc->mi->j_wire); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timing for this payment, wire_deadline: %llu, refund_deadline: %llu\n", - pc->wire_transfer_deadline.abs_value_us, - pc->refund_deadline.abs_value_us); + (unsigned long long) pc->wire_transfer_deadline.abs_value_us, + (unsigned long long) pc->refund_deadline.abs_value_us); dc->dh = TALER_EXCHANGE_deposit (mh, &dc->amount_with_fee, pc->wire_transfer_deadline, @@ -926,7 +926,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh, if (NULL == pc->mi) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Not able to find the specified receiver\n"); + "Not able to find the specified receiver\n"); json_decref (root); return TMH_RESPONSE_reply_external_error (connection, "Unknown receiver given"); diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c index abf4afc6..d6f1c89c 100644 --- a/src/lib/test_merchant_api.c +++ b/src/lib/test_merchant_api.c @@ -1032,6 +1032,7 @@ track_transfer_cb (void *cls, ref = find_command (is, cmd->details.track_transfer.expected_pay_ref); + GNUNET_assert (NULL != ref); found = GNUNET_NO; for (i=0;i<details_length;i++) { @@ -1054,6 +1055,7 @@ track_transfer_cb (void *cls, cref = find_command (is, ref->details.pay.coin_ref); + GNUNET_assert (NULL != cref); switch (cref->oc) { case OC_WITHDRAW_SIGN: |