From 544ba42f445cbff2f544d7e1c83aaffcfa75af3a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 21 Feb 2022 00:23:23 +0100 Subject: -big renaming of structs for consistent naming with P suffix --- src/auditor/report-lib.c | 6 +++--- src/auditor/report-lib.h | 4 ++-- src/auditor/taler-helper-auditor-aggregation.c | 4 ++-- src/auditor/taler-helper-auditor-coins.c | 20 ++++++++++---------- src/auditor/taler-helper-auditor-reserves.c | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/auditor') diff --git a/src/auditor/report-lib.c b/src/auditor/report-lib.c index b59846364..03307aaeb 100644 --- a/src/auditor/report-lib.c +++ b/src/auditor/report-lib.c @@ -172,7 +172,7 @@ add_denomination ( enum GNUNET_DB_QueryStatus TALER_ARL_get_denomination_info_by_hash ( - const struct TALER_DenominationHash *dh, + const struct TALER_DenominationHashP *dh, const struct TALER_DenominationKeyValidityPS **issue) { enum GNUNET_DB_QueryStatus qs; @@ -245,9 +245,9 @@ enum GNUNET_DB_QueryStatus TALER_ARL_get_denomination_info ( const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_DenominationKeyValidityPS **issue, - struct TALER_DenominationHash *dh) + struct TALER_DenominationHashP *dh) { - struct TALER_DenominationHash hc; + struct TALER_DenominationHashP hc; if (NULL == dh) dh = &hc; diff --git a/src/auditor/report-lib.h b/src/auditor/report-lib.h index 8ef7e048a..92560a0b3 100644 --- a/src/auditor/report-lib.h +++ b/src/auditor/report-lib.h @@ -101,7 +101,7 @@ TALER_ARL_report (json_t *array, */ enum GNUNET_DB_QueryStatus TALER_ARL_get_denomination_info_by_hash ( - const struct TALER_DenominationHash *dh, + const struct TALER_DenominationHashP *dh, const struct TALER_DenominationKeyValidityPS **issue); @@ -118,7 +118,7 @@ enum GNUNET_DB_QueryStatus TALER_ARL_get_denomination_info ( const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_DenominationKeyValidityPS **issue, - struct TALER_DenominationHash *dh); + struct TALER_DenominationHashP *dh); /** diff --git a/src/auditor/taler-helper-auditor-aggregation.c b/src/auditor/taler-helper-auditor-aggregation.c index 0b6f6557b..b088b615d 100644 --- a/src/auditor/taler-helper-auditor-aggregation.c +++ b/src/auditor/taler-helper-auditor-aggregation.c @@ -393,7 +393,7 @@ struct WireCheckContext static int check_transaction_history_for_deposit ( const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_MerchantPublicKeyP *merchant_pub, const struct TALER_DenominationKeyValidityPS *issue, const struct TALER_EXCHANGEDB_TransactionList *tl_head, @@ -699,7 +699,7 @@ wire_transfer_information_cb ( const struct TALER_MerchantPublicKeyP *merchant_pub, const char *account_pay_uri, struct GNUNET_TIME_Timestamp exec_time, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_Amount *coin_value, diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c index 04a35ee8d..0630d3e94 100644 --- a/src/auditor/taler-helper-auditor-coins.c +++ b/src/auditor/taler-helper-auditor-coins.c @@ -673,7 +673,7 @@ struct CoinContext * @return transaction status code */ static enum GNUNET_DB_QueryStatus -init_denomination (const struct TALER_DenominationHash *denom_hash, +init_denomination (const struct TALER_DenominationHashP *denom_hash, struct DenominationSummary *ds) { enum GNUNET_DB_QueryStatus qs; @@ -760,7 +760,7 @@ init_denomination (const struct TALER_DenominationHash *denom_hash, static struct DenominationSummary * get_denomination_summary (struct CoinContext *cc, const struct TALER_DenominationKeyValidityPS *issue, - const struct TALER_DenominationHash *dh) + const struct TALER_DenominationHashP *dh) { struct DenominationSummary *ds; @@ -802,7 +802,7 @@ sync_denomination (void *cls, void *value) { struct CoinContext *cc = cls; - struct TALER_DenominationHash denom_h = { + struct TALER_DenominationHashP denom_h = { .hash = *denom_hash }; struct DenominationSummary *ds = value; @@ -963,7 +963,7 @@ sync_denomination (void *cls, static enum GNUNET_GenericReturnValue withdraw_cb (void *cls, uint64_t rowid, - const struct TALER_BlindedCoinHash *h_blind_ev, + const struct TALER_BlindedCoinHashP *h_blind_ev, const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_ReservePublicKeyP *reserve_pub, const struct TALER_ReserveSignatureP *reserve_sig, @@ -972,7 +972,7 @@ withdraw_cb (void *cls, { struct CoinContext *cc = cls; struct DenominationSummary *ds; - struct TALER_DenominationHash dh; + struct TALER_DenominationHashP dh; const struct TALER_DenominationKeyValidityPS *issue; struct TALER_Amount value; enum GNUNET_DB_QueryStatus qs; @@ -1275,7 +1275,7 @@ refresh_session_cb (void *cls, /* verify melt signature */ { - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; struct TALER_Amount fee_refresh; TALER_denom_pub_hash (denom_pub, @@ -1611,8 +1611,8 @@ deposit_cb (void *cls, /* Verify deposit signature */ { - struct TALER_MerchantWireHash h_wire; - struct TALER_DenominationHash h_denom_pub; + struct TALER_MerchantWireHashP h_wire; + struct TALER_DenominationHashP h_denom_pub; struct TALER_Amount deposit_fee; TALER_denom_pub_hash (denom_pub, @@ -1761,7 +1761,7 @@ refund_cb (void *cls, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_MerchantPublicKeyP *merchant_pub, const struct TALER_MerchantSignatureP *merchant_sig, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, uint64_t rtransaction_id, const struct TALER_Amount *amount_with_fee) { @@ -2089,7 +2089,7 @@ recoup_refresh_cb (void *cls, struct GNUNET_TIME_Timestamp timestamp, const struct TALER_Amount *amount, const struct TALER_CoinSpendPublicKeyP *old_coin_pub, - const struct TALER_DenominationHash *old_denom_pub_hash, + const struct TALER_DenominationHashP *old_denom_pub_hash, const struct TALER_CoinPublicInfo *coin, const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_CoinSpendSignatureP *coin_sig, diff --git a/src/auditor/taler-helper-auditor-reserves.c b/src/auditor/taler-helper-auditor-reserves.c index fa096fe05..f14a39995 100644 --- a/src/auditor/taler-helper-auditor-reserves.c +++ b/src/auditor/taler-helper-auditor-reserves.c @@ -491,7 +491,7 @@ handle_reserve_in (void *cls, static enum GNUNET_GenericReturnValue handle_reserve_out (void *cls, uint64_t rowid, - const struct TALER_BlindedCoinHash *h_blind_ev, + const struct TALER_BlindedCoinHashP *h_blind_ev, const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_ReservePublicKeyP *reserve_pub, const struct TALER_ReserveSignatureP *reserve_sig, @@ -508,7 +508,7 @@ handle_reserve_out (void *cls, struct GNUNET_TIME_Timestamp valid_start; struct GNUNET_TIME_Timestamp expire_withdraw; enum GNUNET_DB_QueryStatus qs; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /* should be monotonically increasing */ GNUNET_assert (rowid >= ppr.last_reserve_out_serial_id); -- cgit v1.2.3