1 files changed, 48 insertions, 26 deletions

diff --git a/src/mint/taler-mint-dbinit.c b/src/mint/taler-mint-dbinit.c
index 8106b54c4..838f98e25 100644
--- a/src/mint/taler-mint-dbinit.c
+++ b/src/mint/taler-mint-dbinit.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2014, 2015 Christian Grothoff (and other contributing authors)
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,7 @@
   TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
 */
 /**
- * @file taler-mint-dbinit.c
+ * @file mint/taler-mint-dbinit.c
  * @brief Create tables for the mint database.
  * @author Florian Dold
  */
@@ -24,74 +24,96 @@
 #include "taler_util.h"
 #include "mint_db.h"
 
-#define break_db_err(result) do { \
-    GNUNET_break(0); \
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Database failure: %s\n", PQresultErrorMessage (result)); \
-    PQclear (result); \
-  } while (0)
-
 
+/**
+ * Mint directory with the keys.
+ */
 static char *mint_base_dir;
-static struct GNUNET_CONFIGURATION_Handle *cfg;
-static PGconn *db_conn;
-static char *TALER_MINT_db_connection_cfg_str;
 
+/**
+ * Our configuration.
+ */
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 
+/**
+ * Database connection handle.
+ */
+static PGconn *db_conn;
 
 
 
 /**
- * The main function of the serve tool
+ * The main function of the database initialization tool.
+ * Used to initialize the Taler Mint's database.
  *
  * @param argc number of arguments from the command line
  * @param argv command line arguments
  * @return 0 ok, 1 on error
  */
 int
-main (int argc, char *const *argv)
+main (int argc,
+      char *const *argv)
 {
   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_HELP ("gnunet-mint-keyup OPTIONS"),
+    GNUNET_GETOPT_OPTION_HELP ("gnunet-mint-dbinit OPTIONS"),
     {'d', "mint-dir", "DIR",
      "mint directory", 1,
      &GNUNET_GETOPT_set_filename, &mint_base_dir},
     GNUNET_GETOPT_OPTION_END
   };
+  char *db_connection_cfg_str;
 
-  if (GNUNET_GETOPT_run ("taler-mint-serve", options, argc, argv) < 0)
+  if (GNUNET_GETOPT_run ("taler-mint-dbinit",
+                         options,
+                         argc, argv) < 0)
     return 1;
 
-  GNUNET_assert (GNUNET_OK == GNUNET_log_setup ("taler-mint-dbinit", "INFO", NULL));
-
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_log_setup ("taler-mint-dbinit",
+                                   "INFO",
+                                   NULL));
   if (NULL == mint_base_dir)
   {
-    fprintf (stderr, "Mint base directory not given.\n");
+    fprintf (stderr,
+             "Mint base directory not given.\n");
     return 1;
   }
 
   cfg = TALER_config_load (mint_base_dir);
   if (NULL == cfg)
   {
-    fprintf (stderr, "Can't load mint configuration.\n");
+    fprintf (stderr,
+             "Failed to load mint configuration.\n");
     return 1;
   }
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "mint", "db", &TALER_MINT_db_connection_cfg_str))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "mint",
+                                             "db",
+                                             &db_connection_cfg_str))
   {
-    fprintf (stderr, "Configuration 'mint.db' not found.\n");
-    return 42;
+    fprintf (stderr,
+             "Configuration 'mint.db' not found.\n");
+    return 1;
   }
-  db_conn = PQconnectdb (TALER_MINT_db_connection_cfg_str);
+  db_conn = PQconnectdb (db_connection_cfg_str);
   if (CONNECTION_OK != PQstatus (db_conn))
   {
-    fprintf (stderr, "Database connection failed: %s\n", PQerrorMessage (db_conn));
+    fprintf (stderr,
+             "Database connection failed: %s\n",
+             PQerrorMessage (db_conn));
+    free (db_connection_cfg_str);
     return 1;
   }
+  free (db_connection_cfg_str);
 
   if (GNUNET_OK != TALER_MINT_DB_create_tables (GNUNET_NO))
   {
-    fprintf (stderr, "Failed to initialize database.\n");
+    fprintf (stderr,
+             "Failed to initialize database.\n");
     return 1;
   }
-
   return 0;
 }
+
+/* end of taler-mint-dbinit.c */