From 7f37017e916d5ad66175b5408cefab8b622bdefc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 4 Mar 2020 11:51:00 +0100 Subject: more renaming --- src/exchange-tools/taler-exchange-keycheck.c | 2 +- src/exchange-tools/taler-exchange-keyup.c | 4 +-- src/exchange/taler-exchange-httpd_deposit.c | 4 +-- src/exchange/taler-exchange-httpd_keystate.c | 30 +++++++++++----------- src/exchange/taler-exchange-httpd_keystate.h | 2 +- src/exchange/taler-exchange-httpd_melt.c | 2 +- src/exchange/taler-exchange-httpd_recoup.c | 2 +- .../taler-exchange-httpd_refreshes_reveal.c | 4 +-- src/exchange/taler-exchange-httpd_refund.c | 2 +- src/exchange/taler-exchange-httpd_withdraw.c | 2 +- src/exchangedb/exchangedb_denomkeys.c | 6 ++--- src/exchangedb/plugin_exchangedb_common.c | 4 +-- src/exchangedb/test_exchangedb.c | 4 +-- src/exchangedb/test_exchangedb_denomkeys.c | 10 ++++---- src/include/taler_exchangedb_lib.h | 6 ++--- src/include/taler_exchangedb_plugin.h | 2 +- 16 files changed, 43 insertions(+), 43 deletions(-) (limited to 'src') diff --git a/src/exchange-tools/taler-exchange-keycheck.c b/src/exchange-tools/taler-exchange-keycheck.c index 07b7dc6a2..5094f60c9 100644 --- a/src/exchange-tools/taler-exchange-keycheck.c +++ b/src/exchange-tools/taler-exchange-keycheck.c @@ -132,7 +132,7 @@ static int denomkeys_iter (void *cls, const char *alias, const struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki) + TALER_EXCHANGEDB_DenominationKey *dki) { struct GNUNET_HashCode hc; diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c index f70ff23ac..9a845d4e2 100644 --- a/src/exchange-tools/taler-exchange-keyup.c +++ b/src/exchange-tools/taler-exchange-keyup.c @@ -762,7 +762,7 @@ get_cointype_params (const char *ct, */ static void create_denomkey_issue (const struct CoinTypeParams *params, - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation * + struct TALER_EXCHANGEDB_DenominationKey * dki) { dki->denom_priv.rsa_private_key @@ -820,7 +820,7 @@ exchange_keys_update_cointype (void *cls, int *ret = cls; struct CoinTypeParams p; const char *dkf; - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation denomkey_issue; + struct TALER_EXCHANGEDB_DenominationKey denomkey_issue; if (0 != strncasecmp (coin_alias, "coin_", diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c index da89ff47e..29a41ddec 100644 --- a/src/exchange/taler-exchange-httpd_deposit.c +++ b/src/exchange/taler-exchange-httpd_deposit.c @@ -256,7 +256,7 @@ verify_and_execute_deposit (struct MHD_Connection *connection, int mhd_ret; struct TALER_Amount amount_without_fee; struct DepositContext dc; - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + const struct TALER_EXCHANGEDB_DenominationKey *dki; enum TALER_ErrorCode ec; unsigned int hc; @@ -402,7 +402,7 @@ TEH_DEPOSIT_handler_deposit (struct MHD_Connection *connection, enum TALER_ErrorCode ec; unsigned int hc; struct TALER_EXCHANGEDB_Deposit deposit; - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + struct TALER_EXCHANGEDB_DenominationKey *dki; struct GNUNET_HashCode my_h_wire; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_json ("wire", &wire), diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c index 357616d1a..75e20ad04 100644 --- a/src/exchange/taler-exchange-httpd_keystate.c +++ b/src/exchange/taler-exchange-httpd_keystate.c @@ -92,7 +92,7 @@ struct DenominationKeyEntry * Reference to the public key. * (Must also be in the `denomkey_map`). */ - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + const struct TALER_EXCHANGEDB_DenominationKey *dki; /** * Head of DLL of signatures for this @e dki. @@ -424,7 +424,7 @@ free_denom_key (void *cls, const struct GNUNET_HashCode *key, void *value) { - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki = value; + struct TALER_EXCHANGEDB_DenominationKey *dki = value; (void) cls; (void) key; @@ -590,9 +590,9 @@ denom_key_issue_to_json (const struct TALER_DenominationPublicKey *pk, static int store_in_map (struct GNUNET_CONTAINER_MultiHashMap *map, const struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki) + TALER_EXCHANGEDB_DenominationKey *dki) { - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *d2; + struct TALER_EXCHANGEDB_DenominationKey *d2; int res; { @@ -620,7 +620,7 @@ store_in_map (struct GNUNET_CONTAINER_MultiHashMap *map, } } - d2 = GNUNET_new (struct TALER_EXCHANGEDB_DenominationKeyIssueInformation); + d2 = GNUNET_new (struct TALER_EXCHANGEDB_DenominationKey); d2->issue = dki->issue; if (NULL != dki->denom_priv.rsa_private_key) d2->denom_priv.rsa_private_key @@ -654,7 +654,7 @@ struct AddRevocationContext /** * Denomination key that is revoked. */ - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + const struct TALER_EXCHANGEDB_DenominationKey *dki; /** * Signature affirming the revocation. @@ -733,7 +733,7 @@ add_revocations_transaction (void *cls, /** * Execute transaction to add a denomination to the DB. * - * @param cls closure with the `const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *` + * @param cls closure with the `const struct TALER_EXCHANGEDB_DenominationKey *` * @param connection NULL * @param session database session to use * @param[out] mhd_ret not used @@ -745,7 +745,7 @@ add_denomination_transaction (void *cls, struct TALER_EXCHANGEDB_Session *session, int *mhd_ret) { - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki = cls; + const struct TALER_EXCHANGEDB_DenominationKey *dki = cls; enum GNUNET_DB_QueryStatus qs; struct TALER_EXCHANGEDB_DenominationKeyInformationP issue_exists; @@ -780,7 +780,7 @@ static int reload_keys_denom_iter (void *cls, const char *alias, const struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki) + TALER_EXCHANGEDB_DenominationKey *dki) { struct ResponseFactoryContext *rfc = cls; struct TEH_KS_StateHandle *key_state = rfc->key_state; @@ -869,7 +869,7 @@ revocations_iter (void *cls, struct ResponseFactoryContext *rfc = cls; struct TEH_KS_StateHandle *key_state = rfc->key_state; struct AddRevocationContext arc; - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + struct TALER_EXCHANGEDB_DenominationKey *dki; dki = GNUNET_CONTAINER_multihashmap_get (key_state->denomkey_map, denom_hash); @@ -1129,7 +1129,7 @@ reload_auditor_iter (void *cls, * * @param cls a `struct ResponseFactoryContext` * @param denom_hash hash of a denomination key - * @param value a `struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *` + * @param value a `struct TALER_EXCHANGEDB_DenominationKey *` * @return #GNUNET_OK */ static int @@ -1138,7 +1138,7 @@ initialize_denomkey_array (void *cls, void *value) { struct ResponseFactoryContext *rfc = cls; - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki = value; + struct TALER_EXCHANGEDB_DenominationKey *dki = value; rfc->denomkey_array[rfc->denomkey_array_length].denom_key_hash = *denom_hash; rfc->denomkey_array[rfc->denomkey_array_length++].dki = dki; @@ -1597,7 +1597,7 @@ reload_public_denoms_cb (void *cls, TALER_EXCHANGEDB_DenominationKeyInformationP *issue) { struct ResponseFactoryContext *rfc = cls; - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki; + struct TALER_EXCHANGEDB_DenominationKey dki; int ret; if (rfc->now.abs_value_us > GNUNET_TIME_absolute_ntoh @@ -1970,7 +1970,7 @@ TEH_KS_acquire_ (struct GNUNET_TIME_Absolute now, * @return the denomination key issue, * or NULL if denom_pub could not be found (or is not valid at this time for the given @a use) */ -struct TALER_EXCHANGEDB_DenominationKeyIssueInformation * +struct TALER_EXCHANGEDB_DenominationKey * TEH_KS_denomination_key_lookup_by_hash (const struct TEH_KS_StateHandle *key_state, const struct @@ -1979,7 +1979,7 @@ TEH_KS_denomination_key_lookup_by_hash (const struct enum TALER_ErrorCode *ec, unsigned int *hc) { - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + struct TALER_EXCHANGEDB_DenominationKey *dki; struct GNUNET_TIME_Absolute now; const struct GNUNET_CONTAINER_MultiHashMap *map; diff --git a/src/exchange/taler-exchange-httpd_keystate.h b/src/exchange/taler-exchange-httpd_keystate.h index a69060964..1b8e820a9 100644 --- a/src/exchange/taler-exchange-httpd_keystate.h +++ b/src/exchange/taler-exchange-httpd_keystate.h @@ -145,7 +145,7 @@ enum TEH_KS_DenominationKeyUse * @return the denomination key issue, * or NULL if denom_pub could not be found (or is not valid at this time for the given @a use) */ -struct TALER_EXCHANGEDB_DenominationKeyIssueInformation * +struct TALER_EXCHANGEDB_DenominationKey * TEH_KS_denomination_key_lookup_by_hash (const struct TEH_KS_StateHandle *key_state, const struct diff --git a/src/exchange/taler-exchange-httpd_melt.c b/src/exchange/taler-exchange-httpd_melt.c index 035fc48f1..e0f67d5e4 100644 --- a/src/exchange/taler-exchange-httpd_melt.c +++ b/src/exchange/taler-exchange-httpd_melt.c @@ -454,7 +454,7 @@ check_for_denomination_key (struct MHD_Connection *connection, { /* Baseline: check if deposits/refreshs are generally simply still allowed for this denomination */ - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + struct TALER_EXCHANGEDB_DenominationKey *dki; unsigned int hc; enum TALER_ErrorCode ec; diff --git a/src/exchange/taler-exchange-httpd_recoup.c b/src/exchange/taler-exchange-httpd_recoup.c index f4cd99155..b3fca6371 100644 --- a/src/exchange/taler-exchange-httpd_recoup.c +++ b/src/exchange/taler-exchange-httpd_recoup.c @@ -420,7 +420,7 @@ verify_and_execute_recoup (struct MHD_Connection *connection, int refreshed) { struct RecoupContext pc; - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + const struct TALER_EXCHANGEDB_DenominationKey *dki; struct TALER_RecoupRequestPS pr; struct GNUNET_HashCode c_hash; char *coin_ev; diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c b/src/exchange/taler-exchange-httpd_refreshes_reveal.c index ff5718fcc..3d759734a 100644 --- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c +++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c @@ -141,7 +141,7 @@ struct RevealContext /** * Denominations being requested. */ - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation **dkis; + const struct TALER_EXCHANGEDB_DenominationKey **dkis; /** * Envelopes to be signed. @@ -538,7 +538,7 @@ resolve_refresh_reveal_denominations (struct TEH_KS_StateHandle *key_state, { unsigned int num_fresh_coins = json_array_size (new_denoms_h_json); const struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation *dkis[num_fresh_coins]; + TALER_EXCHANGEDB_DenominationKey *dkis[num_fresh_coins]; struct GNUNET_HashCode dki_h[num_fresh_coins]; struct TALER_RefreshCoinData rcds[num_fresh_coins]; struct TALER_CoinSpendSignatureP link_sigs[num_fresh_coins]; diff --git a/src/exchange/taler-exchange-httpd_refund.c b/src/exchange/taler-exchange-httpd_refund.c index 2bbab0418..c66a7da47 100644 --- a/src/exchange/taler-exchange-httpd_refund.c +++ b/src/exchange/taler-exchange-httpd_refund.c @@ -484,7 +484,7 @@ verify_and_execute_refund (struct MHD_Connection *connection, } /* Obtain information about the coin's denomination! */ { - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + struct TALER_EXCHANGEDB_DenominationKey *dki; unsigned int hc; enum TALER_ErrorCode ec; diff --git a/src/exchange/taler-exchange-httpd_withdraw.c b/src/exchange/taler-exchange-httpd_withdraw.c index 33308dce2..c8ca4822f 100644 --- a/src/exchange/taler-exchange-httpd_withdraw.c +++ b/src/exchange/taler-exchange-httpd_withdraw.c @@ -149,7 +149,7 @@ struct WithdrawContext /** * Details about denomination we are about to withdraw. */ - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki; + struct TALER_EXCHANGEDB_DenominationKey *dki; /** * Set to the resulting signed coin data to be returned to the client. diff --git a/src/exchangedb/exchangedb_denomkeys.c b/src/exchangedb/exchangedb_denomkeys.c index 0edf811dc..01b04198f 100644 --- a/src/exchangedb/exchangedb_denomkeys.c +++ b/src/exchangedb/exchangedb_denomkeys.c @@ -107,7 +107,7 @@ TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir, int TALER_EXCHANGEDB_denomination_key_read (const char *filename, struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation + TALER_EXCHANGEDB_DenominationKey *dki) { uint64_t size; @@ -186,7 +186,7 @@ TALER_EXCHANGEDB_denomination_key_read (const char *filename, int TALER_EXCHANGEDB_denomination_key_write (const char *filename, const struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation + TALER_EXCHANGEDB_DenominationKey *dki) { char *priv_enc; @@ -276,7 +276,7 @@ denomkeys_iterate_keydir_iter (void *cls, const char *filename) { struct DenomkeysIterateContext *dic = cls; - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation issue; + struct TALER_EXCHANGEDB_DenominationKey issue; int ret; memset (&issue, 0, sizeof (issue)); diff --git a/src/exchangedb/plugin_exchangedb_common.c b/src/exchangedb/plugin_exchangedb_common.c index 448d45827..ce425f824 100644 --- a/src/exchangedb/plugin_exchangedb_common.c +++ b/src/exchangedb/plugin_exchangedb_common.c @@ -132,7 +132,7 @@ common_free_coin_transaction_list (void *cls, { struct TALER_EXCHANGEDB_RecoupRefreshListEntry *rr; - rr = tl->recoup_refresh; + rr = tl->details.recoup_refresh; if (NULL != rr->coin.denom_sig.rsa_signature) GNUNET_CRYPTO_rsa_signature_free (rr->coin.denom_sig.rsa_signature); GNUNET_free (rr); @@ -143,7 +143,7 @@ common_free_coin_transaction_list (void *cls, struct TALER_EXCHANGEDB_TransactionList *next; next = tl->next; - GNUNET_free (list); + GNUNET_free (tl); tl = next; } } diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c index b52055996..8ebe9cb26 100644 --- a/src/exchangedb/test_exchangedb.c +++ b/src/exchangedb/test_exchangedb.c @@ -220,7 +220,7 @@ create_denom_key_pair (unsigned int size, const struct TALER_Amount *fee_refund) { struct DenomKeyPair *dkp; - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki; + struct TALER_EXCHANGEDB_DenominationKey dki; struct TALER_EXCHANGEDB_DenominationKeyInformationP issue2; dkp = GNUNET_new (struct DenomKeyPair); @@ -233,7 +233,7 @@ create_denom_key_pair (unsigned int size, are not properly initialized for this test. */ memset (&dki, 0, - sizeof (struct TALER_EXCHANGEDB_DenominationKeyIssueInformation)); + sizeof (struct TALER_EXCHANGEDB_DenominationKey)); dki.denom_pub = dkp->pub; GNUNET_TIME_round_abs (&now); dki.issue.properties.start = GNUNET_TIME_absolute_hton (now); diff --git a/src/exchangedb/test_exchangedb_denomkeys.c b/src/exchangedb/test_exchangedb_denomkeys.c index 973d50601..4dd01d26b 100644 --- a/src/exchangedb/test_exchangedb_denomkeys.c +++ b/src/exchangedb/test_exchangedb_denomkeys.c @@ -45,9 +45,9 @@ static int dki_iter (void *cls, const char *alias, - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki) + const struct TALER_EXCHANGEDB_DenominationKey *dki) { - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *exp = cls; + const struct TALER_EXCHANGEDB_DenominationKey *exp = cls; if (0 != GNUNET_memcmp (&exp->issue, &dki->issue)) @@ -88,7 +88,7 @@ dki_iter_revoked (void *cls, const struct GNUNET_HashCode *denom_hash, const struct TALER_MasterSignatureP *revocation_master_sig) { - const struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *exp = cls; + const struct TALER_EXCHANGEDB_DenominationKey *exp = cls; if (NULL == revocation_master_sig) { @@ -109,10 +109,10 @@ int main (int argc, const char *const argv[]) { - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki; + struct TALER_EXCHANGEDB_DenominationKey dki; char *enc; size_t enc_size; - struct TALER_EXCHANGEDB_DenominationKeyIssueInformation dki_read; + struct TALER_EXCHANGEDB_DenominationKey dki_read; struct GNUNET_CRYPTO_EddsaPrivateKey *pk; struct TALER_MasterPrivateKeyP master_priv; struct TALER_MasterPublicKeyP master_pub; diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h index 59864dd4d..91c7d7fa8 100644 --- a/src/include/taler_exchangedb_lib.h +++ b/src/include/taler_exchangedb_lib.h @@ -105,7 +105,7 @@ typedef int (*TALER_EXCHANGEDB_DenominationKeyIterator)(void *cls, const char *alias, const struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation + TALER_EXCHANGEDB_DenominationKey *dki); @@ -194,7 +194,7 @@ TALER_EXCHANGEDB_denomination_key_revoke (const char *revocation_dir, int TALER_EXCHANGEDB_denomination_key_write (const char *filename, const struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation + TALER_EXCHANGEDB_DenominationKey *dki); @@ -208,7 +208,7 @@ TALER_EXCHANGEDB_denomination_key_write (const char *filename, int TALER_EXCHANGEDB_denomination_key_read (const char *filename, struct - TALER_EXCHANGEDB_DenominationKeyIssueInformation + TALER_EXCHANGEDB_DenominationKey *dki); diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 795c6d7be..1089bec5a 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -80,7 +80,7 @@ GNUNET_NETWORK_STRUCT_END * @brief All information about a denomination key (which is used to * sign coins into existence). */ -struct TALER_EXCHANGEDB_DenominationKeyIssueInformation +struct TALER_EXCHANGEDB_DenominationKey { /** * The private key of the denomination. Will be NULL if the private -- cgit v1.2.3