more renaming

4 files changed, 12 insertions, 12 deletions

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;