diff options
Diffstat (limited to 'src/reducer/anastasis_api_backup_redux.c')
| -rw-r--r-- | src/reducer/anastasis_api_backup_redux.c | 82 |
1 files changed, 42 insertions, 40 deletions
diff --git a/src/reducer/anastasis_api_backup_redux.c b/src/reducer/anastasis_api_backup_redux.c index cea1360..02e2401 100644 --- a/src/reducer/anastasis_api_backup_redux.c +++ b/src/reducer/anastasis_api_backup_redux.c @@ -1440,20 +1440,22 @@ select_policies (struct PolicyBuilder *pb) GNUNET_assert (NULL != method_arr); for (unsigned int i = 0; i < pb->req_methods; i++) { - json_t *policy_method = json_pack ("{s:I, s:s}", - "authentication_method", - (json_int_t) p->challenges[i], - "provider", - pm->providers[i].provider_name); + json_t *policy_method = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_uint64 ("authentication_method", + p->challenges[i]), + GNUNET_JSON_pack_string ("provider", + pm->providers[i].provider_name)); + GNUNET_assert (0 == json_array_append_new (method_arr, policy_method)); } { - json_t *policy = json_pack ("{s:o}", - "methods", - method_arr); - GNUNET_assert (NULL != policy); + json_t *policy = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_array_steal ( + "methods", + method_arr)); + GNUNET_assert (0 == json_array_append_new (pb->policies, policy)); @@ -1616,8 +1618,9 @@ done_authentication (json_t *state, url, &salt)) continue; /* skip providers that are down */ - provider = json_pack ("{s:s}", - "provider_url", url); + provider = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_string ("provider_url", + url)); GNUNET_assert (NULL != provider); GNUNET_assert (0 == json_array_append_new (policy_providers, @@ -1651,9 +1654,9 @@ done_authentication (json_t *state, "unworkable provider requested"); return NULL; } - provider = json_pack ("{s:s}", - "provider_url", url); - GNUNET_assert (NULL != provider); + provider = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_string ("provider_url", + url_str)); GNUNET_assert (0 == json_array_append_new (policy_providers, provider)); @@ -1968,10 +1971,9 @@ add_policy (json_t *state, json_t *policy; json_t *idx; - policy = json_pack ("{s:o}", - "methods", - methods); - GNUNET_assert (NULL != policy); + policy = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_array_steal ("methods", + methods)); idx = json_object_get (arguments, "policy_index"); if ( (NULL == idx) || @@ -2447,9 +2449,9 @@ update_expiration_cost (json_t *state, { json_t *ao; - ao = json_pack ("{s:o}", - "fee", - TALER_JSON_from_amount (&costs->cost)); + ao = GNUNET_JSON_PACK ( + TALER_JSON_pack_amount ("fee", + &costs->cost)); GNUNET_assert (0 == json_array_append_new (arr, ao)); @@ -2821,11 +2823,11 @@ secret_share_result_cb (void *cls, = &sr->details.success.pss[i]; json_t *d; - d = json_pack ("{s:I, s:o}", - "policy_version", - pssi->policy_version, - "policy_expiration", - GNUNET_JSON_from_time_abs (pssi->policy_expiration)); + d = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_uint64 ("policy_version", + pssi->policy_version), + GNUNET_JSON_pack_time_abs ("policy_expiration", + pssi->policy_expiration)); GNUNET_assert (NULL != d); GNUNET_assert (0 == json_object_set_new (sa, @@ -2864,11 +2866,11 @@ secret_share_result_cb (void *cls, json_t *provider; spr = &sr->details.payment_required.payment_requests[i]; - pr = json_pack ("{s:s, s:s}", - "payto", - spr->payment_request_url, - "provider", - spr->provider_url); + pr = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_string ("payto", + spr->payment_request_url), + GNUNET_JSON_pack_string ("provider", + spr->provider_url)); GNUNET_assert (0 == json_array_append_new (ra, pr)); @@ -2916,15 +2918,15 @@ secret_share_result_cb (void *cls, { json_t *details; - details = json_pack ("{s:s, s:I, s:I, s:s}", - "backup_state", - "ERROR", - "http_status", - (json_int_t) sr->details.provider_failure.http_status, - "upload_status", - (json_int_t) sr->details.provider_failure.ec, - "provider_url", - sr->details.provider_failure.provider_url); + details = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_string ("backup_state", + "ERROR"), + GNUNET_JSON_pack_uint64 ("http_status", + sr->details.provider_failure.http_status), + GNUNET_JSON_pack_uint64 ("upload_status", + sr->details.provider_failure.ec), + GNUNET_JSON_pack_string ("provider_url", + sr->details.provider_failure.provider_url)); uc->cb (uc->cb_cls, TALER_EC_ANASTASIS_REDUCER_BACKUP_PROVIDER_FAILED, details); |