From 58463df9d2f35676692f37dabf38a04f93d30424 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 10 Apr 2017 17:01:20 +0200
Subject: fix test_exchangedb denomkeys test

---
 src/exchange-lib/test_exchange_api.c       |  1 -
 src/exchangedb/test_exchangedb_denomkeys.c | 18 ++++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c
index c32a21be9..b4cd108fc 100644
--- a/src/exchange-lib/test_exchange_api.c
+++ b/src/exchange-lib/test_exchange_api.c
@@ -3535,7 +3535,6 @@ cleanup_files ()
 }
 
 
-
 /**
  * Main function for the testcase for the exchange API.
  *
diff --git a/src/exchangedb/test_exchangedb_denomkeys.c b/src/exchangedb/test_exchangedb_denomkeys.c
index 3d6585348..06465a4ea 100644
--- a/src/exchangedb/test_exchangedb_denomkeys.c
+++ b/src/exchangedb/test_exchangedb_denomkeys.c
@@ -145,7 +145,6 @@ main (int argc,
   char *enc_read;
   size_t enc_read_size;
   char *tmpfile;
-  char *tmpdir2;
   char *tmpdir;
   int ret;
   struct GNUNET_TIME_Absolute start;
@@ -193,17 +192,11 @@ main (int argc,
                                                       &dki_iter,
                                                       &dki));
 
-  GNUNET_asprintf (&tmpdir2,
-                   "%s/%s/",
-                   tmpdir,
-                   TALER_EXCHANGEDB_DIR_DENOMINATION_KEYS);
   EXITIF (GNUNET_OK !=
-          TALER_EXCHANGEDB_denomination_key_revoke (tmpdir2,
+          TALER_EXCHANGEDB_denomination_key_revoke (tmpdir,
                                                     "cur-unit-uuid",
                                                     &dki,
                                                     &master_priv));
-  GNUNET_free (tmpdir2);
-
   EXITIF (1 !=
           TALER_EXCHANGEDB_denomination_keys_iterate (tmpdir,
                                                       &master_pub,
@@ -219,12 +212,13 @@ main (int argc,
                        enc_size));
   ret = 0;
 
-  EXITIF_exit:
+ EXITIF_exit:
   GNUNET_free_non_null (enc);
-  if (NULL != tmpfile)
+  GNUNET_free_non_null (tmpfile);
+  if (NULL != tmpdir)
   {
-    (void) GNUNET_DISK_directory_remove (tmpfile);
-    GNUNET_free (tmpfile);
+    (void) GNUNET_DISK_directory_remove (tmpdir);
+    GNUNET_free (tmpdir);
   }
   GNUNET_free_non_null (enc_read);
   if (NULL != dki.denom_priv.rsa_private_key)
-- 
cgit v1.2.3