fix

[oweals/gnunet.git] / src / datacache / plugin_datacache_postgres.c

diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c
index 75d644da9ca83f9bbadbe647da2107919e380ea7..e391469fd12e59d1b1f1ff7c44fa7adfb5746348 100644 (file)
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -25,7 +25,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "plugin_datacache.h"
+#include "gnunet_datacache_plugin.h"
 #include <postgresql/libpq-fe.h>
 
 #define DEBUG_POSTGRES GNUNET_NO
@@ -134,11 +134,12 @@ init_connection (struct Plugin *plugin)
   PGresult *ret;
 
   /* Open database and precompile statements */
-  conninfo = NULL;
-  GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
-                                        "datacache-postgres",
-                                        "CONFIG",
-                                        &conninfo);
+  if (GNUNET_OK != 
+      GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
+                                            "datacache-postgres",
+                                            "CONFIG",
+                                            &conninfo))
+    conninfo = NULL;
   plugin->dbh = PQconnectdb (conninfo == NULL ? "" : conninfo);
   GNUNET_free_non_null (conninfo);
   if (NULL == plugin->dbh)
@@ -169,8 +170,8 @@ init_connection (struct Plugin *plugin)
                       (ret,
                        PG_DIAG_SQLSTATE)))))
     {
-      check_result (plugin,
-                   ret, PGRES_COMMAND_OK, "CREATE TABLE", "gn090dc", __LINE__);
+      (void) check_result (plugin,
+                          ret, PGRES_COMMAND_OK, "CREATE TABLE", "gn090dc", __LINE__);
       PQfinish (plugin->dbh);
       plugin->dbh = NULL;
       return GNUNET_SYSERR;