diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-06-04 01:06:09 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-06-04 01:06:09 +0200 |
commit | d3522a172d544cf759258972fa9de14dfb1e2b3f (patch) | |
tree | 5d2cdde6bf2605c909c4502b1ad95a3b2d7f442a /src/lib/merchant_api_proposal.c | |
parent | 0878d31f69185cf66d58eea98589948fa8bebe67 (diff) | |
parent | fc6ee7d0f6bb4c88f969baebc9a677d77cbc386e (diff) | |
download | merchant-d3522a172d544cf759258972fa9de14dfb1e2b3f.tar.gz merchant-d3522a172d544cf759258972fa9de14dfb1e2b3f.tar.bz2 merchant-d3522a172d544cf759258972fa9de14dfb1e2b3f.zip |
fix merge issue: proposal_data -> contract_terms rename
Diffstat (limited to 'src/lib/merchant_api_proposal.c')
-rw-r--r-- | src/lib/merchant_api_proposal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c index 5a05c260..c200ce5b 100644 --- a/src/lib/merchant_api_proposal.c +++ b/src/lib/merchant_api_proposal.c @@ -115,14 +115,14 @@ handle_proposal_finished (void *cls, const json_t *json) { struct TALER_MERCHANT_ProposalOperation *po = cls; - json_t *proposal_data; + json_t *contract_terms; const struct TALER_MerchantSignatureP *sigp; const struct GNUNET_HashCode *hashp; struct TALER_MerchantSignatureP sig; struct GNUNET_HashCode hash; po->job = NULL; - proposal_data = NULL; + contract_terms = NULL; sigp = NULL; hashp = NULL; switch (response_code) @@ -132,7 +132,7 @@ handle_proposal_finished (void *cls, case MHD_HTTP_OK: { struct GNUNET_JSON_Specification spec[] = { - GNUNET_JSON_spec_json ("data", &proposal_data), + GNUNET_JSON_spec_json ("data", &contract_terms), GNUNET_JSON_spec_fixed_auto ("sig", &sig), GNUNET_JSON_spec_fixed_auto ("hash", &hash), GNUNET_JSON_spec_end() @@ -182,11 +182,11 @@ handle_proposal_finished (void *cls, response_code, TALER_JSON_get_error_code (json), json, - proposal_data, + contract_terms, sigp, hashp); - if (NULL != proposal_data) - json_decref (proposal_data); + if (NULL != contract_terms) + json_decref (contract_terms); } |