From f19e58b87d870d322d2a90d50488f5899f0e7049 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 7 Sep 2020 13:00:04 +0200 Subject: remove ?, as fulfillment_url cannot be NULL here --- .../taler-merchant-httpd_private-get-orders-ID.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/backend/taler-merchant-httpd_private-get-orders-ID.c') diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c index a57845d4..5c43416b 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_private-get-orders-ID.c @@ -982,7 +982,7 @@ TMH_private_get_orders_ID (const struct TMH_RequestHandler *rh, NULL); ret = TALER_MHD_reply_json_pack (connection, MHD_HTTP_OK, - "{s:s, s:s, s:s, s:s, s:s?}", + "{s:s, s:s, s:s, s:s, s:s}", "taler_pay_uri", taler_pay_uri, "order_status_url", @@ -1194,17 +1194,16 @@ TMH_private_get_orders_ID (const struct TMH_RequestHandler *rh, * * Note that we don't allow this outside of session-based payment, as * otherwise this becomes an oracle to convert order_id to h_contract. - */ - if (NULL != gorc->session_id) + */if (NULL != gorc->session_id) h_contract = &gorc->h_contract_terms; order_status_url = - TMH_make_order_status_url (connection, - hc->infix, - gorc->session_id, - hc->instance->settings.id, - &claim_token, - h_contract); + TMH_make_order_status_url (connection, + hc->infix, + gorc->session_id, + hc->instance->settings.id, + &claim_token, + h_contract); } ret = TALER_MHD_reply_json_pack (connection, -- cgit v1.2.3