diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-get-instances.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-get-instances.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/backend/taler-merchant-httpd_private-get-instances.c b/src/backend/taler-merchant-httpd_private-get-instances.c index 542d0b44..f802fe66 100644 --- a/src/backend/taler-merchant-httpd_private-get-instances.c +++ b/src/backend/taler-merchant-httpd_private-get-instances.c @@ -1,6 +1,6 @@ /* This file is part of TALER - (C) 2019, 2020 Taler Systems SA + (C) 2019-2021 Taler Systems SA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software @@ -71,18 +71,17 @@ add_instance (void *cls, GNUNET_assert (0 == json_array_append_new ( ja, - json_pack ( - "{s:s, s:s, s:o, s:o, s:b}", - "name", - mi->settings.name, - "id", - mi->settings.id, - "merchant_pub", - GNUNET_JSON_from_data_auto (&mi->merchant_pub), - "payment_targets", - pta, - "deleted", - mi->deleted))); + GNUNET_JSON_PACK ( + GNUNET_JSON_pack_string ("name", + mi->settings.name), + GNUNET_JSON_pack_string ("id", + mi->settings.id), + GNUNET_JSON_pack_data_auto ("merchant_pub", + &mi->merchant_pub), + GNUNET_JSON_pack_array_steal ("payment_targets", + pta), + GNUNET_JSON_pack_bool ("deleted", + mi->deleted)))); return GNUNET_OK; } @@ -108,10 +107,11 @@ TMH_private_get_instances (const struct TMH_RequestHandler *rh, GNUNET_CONTAINER_multihashmap_iterate (TMH_by_id_map, &add_instance, ia); - return TALER_MHD_reply_json_pack (connection, - MHD_HTTP_OK, - "{s:o}", - "instances", ia); + return TALER_MHD_REPLY_JSON_PACK ( + connection, + MHD_HTTP_OK, + GNUNET_JSON_pack_array_steal ("instances", + ia)); } |