diff options
| author | Christian Grothoff <grothoff@gnunet.org> | 2021-10-24 12:25:57 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-10-27 09:23:12 +0200 |
| commit | 464c1f806cd1518ebd87b598c7d8232e9f234ac2 (patch) | |
| tree | 13f932e3a7c5494c1c8b15aabf6897844598faf6 /src/lib/exchange_api_deposits_get.c | |
| parent | d4e03b12ae96d9e540d28b03f11a58dd4101832a (diff) | |
| download | exchange-464c1f806cd1518ebd87b598c7d8232e9f234ac2.tar.gz exchange-464c1f806cd1518ebd87b598c7d8232e9f234ac2.tar.bz2 exchange-464c1f806cd1518ebd87b598c7d8232e9f234ac2.zip | |
-more changes towards fixing FTBFS
Diffstat (limited to 'src/lib/exchange_api_deposits_get.c')
| -rw-r--r-- | src/lib/exchange_api_deposits_get.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/lib/exchange_api_deposits_get.c b/src/lib/exchange_api_deposits_get.c index e449aefbe..843b00ff3 100644 --- a/src/lib/exchange_api_deposits_get.c +++ b/src/lib/exchange_api_deposits_get.c @@ -278,8 +278,8 @@ struct TALER_EXCHANGE_DepositGetHandle * TALER_EXCHANGE_deposits_get ( struct TALER_EXCHANGE_Handle *exchange, const struct TALER_MerchantPrivateKeyP *merchant_priv, - const struct GNUNET_HashCode *h_wire, - const struct GNUNET_HashCode *h_contract_terms, + const struct TALER_MerchantWireHash *h_wire, + const struct TALER_PrivateContractHash *h_contract_terms, const struct TALER_CoinSpendPublicKeyP *coin_pub, TALER_EXCHANGE_DepositGetCallback cb, void *cb_cls) @@ -290,9 +290,9 @@ TALER_EXCHANGE_deposits_get ( struct GNUNET_CURL_Context *ctx; CURL *eh; char arg_str[(sizeof (struct TALER_CoinSpendPublicKeyP) - + sizeof (struct GNUNET_HashCode) + + sizeof (struct TALER_MerchantWireHash) + sizeof (struct TALER_MerchantPublicKeyP) - + sizeof (struct GNUNET_HashCode) + + sizeof (struct TALER_PrivateContractHash) + sizeof (struct TALER_MerchantSignatureP)) * 2 + 48]; if (GNUNET_YES != @@ -316,37 +316,32 @@ TALER_EXCHANGE_deposits_get ( char cpub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2]; char mpub_str[sizeof (struct TALER_MerchantPublicKeyP) * 2]; char msig_str[sizeof (struct TALER_MerchantSignatureP) * 2]; - char chash_str[sizeof (struct GNUNET_HashCode) * 2]; - char whash_str[sizeof (struct GNUNET_HashCode) * 2]; + char chash_str[sizeof (struct TALER_PrivateContractHash) * 2]; + char whash_str[sizeof (struct TALER_MerchantWireHash) * 2]; char *end; end = GNUNET_STRINGS_data_to_string (h_wire, - sizeof (struct - GNUNET_HashCode), + sizeof (*h_wire), whash_str, sizeof (whash_str)); *end = '\0'; end = GNUNET_STRINGS_data_to_string (&dtp.merchant, - sizeof (struct - TALER_MerchantPublicKeyP), + sizeof (dtp.merchant), mpub_str, sizeof (mpub_str)); *end = '\0'; end = GNUNET_STRINGS_data_to_string (h_contract_terms, - sizeof (struct - GNUNET_HashCode), + sizeof (*h_contract_terms), chash_str, sizeof (chash_str)); *end = '\0'; end = GNUNET_STRINGS_data_to_string (coin_pub, - sizeof (struct - TALER_CoinSpendPublicKeyP), + sizeof (*coin_pub), cpub_str, sizeof (cpub_str)); *end = '\0'; end = GNUNET_STRINGS_data_to_string (&merchant_sig, - sizeof (struct - TALER_MerchantSignatureP), + sizeof (merchant_sig), msig_str, sizeof (msig_str)); *end = '\0'; |