3 files changed, 28 insertions, 30 deletions

diff --git a/src/mint-tools/taler-mint-dbinit.c b/src/mint-tools/taler-mint-dbinit.c
index 0eefc63b4..3293a69ab 100644
--- a/src/mint-tools/taler-mint-dbinit.c
+++ b/src/mint-tools/taler-mint-dbinit.c
@@ -21,9 +21,7 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <libpq-fe.h>
-#include "taler_util.h"
 #include "taler_mintdb_plugin.h"
-#include "taler_mintdb_lib.h"
 
 /**
  * Mint directory with the keys.
diff --git a/src/mint-tools/taler-mint-keyup.c b/src/mint-tools/taler-mint-keyup.c
index cc60756a9..70c664433 100644
--- a/src/mint-tools/taler-mint-keyup.c
+++ b/src/mint-tools/taler-mint-keyup.c
@@ -22,8 +22,6 @@
  * @author Christian Grothoff
  */
 #include <platform.h>
-#include <gnunet/gnunet_util_lib.h>
-#include "taler_util.h"
 #include "taler_mintdb_lib.h"
 
 /**
diff --git a/src/mint-tools/taler-mint-reservemod.c b/src/mint-tools/taler-mint-reservemod.c
index 5bb6bce46..9dff5731c 100644
--- a/src/mint-tools/taler-mint-reservemod.c
+++ b/src/mint-tools/taler-mint-reservemod.c
@@ -22,11 +22,7 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <libpq-fe.h>
-#include "taler_util.h"
-#include "taler_signatures.h"
-#include "taler_pq_lib.h"
 #include "taler_mintdb_plugin.h"
-#include "taler_mintdb_lib.h"
 
 /**
  * After what time to inactive reserves expire?
@@ -98,6 +94,9 @@ main (int argc, char *const *argv)
   {
     fprintf (stderr,
              "Mint directory not given\n");
+    GNUNET_free_non_null (add_str);
+    GNUNET_free_non_null (details);
+    GNUNET_free_non_null (reserve_pub_str);
     return 1;
   }
   if ((NULL == reserve_pub_str) ||
@@ -109,6 +108,9 @@ main (int argc, char *const *argv)
   {
     fprintf (stderr,
              "Parsing reserve key invalid\n");
+    GNUNET_free_non_null (add_str);
+    GNUNET_free_non_null (details);
+    GNUNET_free_non_null (reserve_pub_str);
     return 1;
   }
   if ( (NULL == add_str) ||
@@ -119,6 +121,9 @@ main (int argc, char *const *argv)
     fprintf (stderr,
              "Failed to parse currency amount `%s'\n",
              add_str);
+    GNUNET_free_non_null (add_str);
+    GNUNET_free_non_null (details);
+    GNUNET_free_non_null (reserve_pub_str);
     return 1;
   }
 
@@ -126,7 +131,9 @@ main (int argc, char *const *argv)
   {
     fprintf (stderr,
              "No wiring details given (justification required)\n");
-    return 1;
+   GNUNET_free_non_null (add_str);
+   GNUNET_free_non_null (reserve_pub_str);
+   return 1;
   }
 
   cfg = TALER_config_load (mint_directory);
@@ -134,7 +141,10 @@ main (int argc, char *const *argv)
   {
     fprintf (stderr,
              "Failed to load mint configuration\n");
-    return 1;
+    GNUNET_free_non_null (add_str);
+    GNUNET_free_non_null (details);
+    GNUNET_free_non_null (reserve_pub_str);
+   return 1;
   }
   ret = 1;
   if (NULL ==
@@ -153,34 +163,23 @@ main (int argc, char *const *argv)
              "Failed to initialize DB session\n");
     goto cleanup;
   }
-  if (GNUNET_OK !=
-      plugin->start (plugin->cls,
-                     session))
-  {
-    fprintf (stderr,
-             "Failed to start transaction\n");
-    goto cleanup;
-  }
   expiration = GNUNET_TIME_relative_to_absolute (RESERVE_EXPIRATION);
-  if (GNUNET_OK !=
-      plugin->reserves_in_insert (plugin->cls,
-                                  session,
-                                  &reserve_pub,
-                                  &add_value,
-                                  details,
-                                  expiration))
+  ret = plugin->reserves_in_insert (plugin->cls,
+				    session,
+				    &reserve_pub,
+				    &add_value,
+				    details,
+				    expiration);
+  if (GNUNET_SYSERR == ret)
   {
     fprintf (stderr,
              "Failed to update reserve.\n");
     goto cleanup;
   }
-  if (GNUNET_OK !=
-      plugin->commit (plugin->cls,
-                     session))
+  if (GNUNET_NO == ret)
   {
     fprintf (stderr,
-             "Failed to commit transaction\n");
-    goto cleanup;
+             "Record exists, reserve not updated.\n");
   }
   ret = 0;
  cleanup:
@@ -188,6 +187,9 @@ main (int argc, char *const *argv)
     TALER_MINTDB_plugin_unload (plugin);
   if (NULL != cfg)
     GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free_non_null (add_str);
+  GNUNET_free_non_null (details);
+  GNUNET_free_non_null (reserve_pub_str);
   return ret;
 }