ensure psql fails hard if there is an error in the SQL (fixes #6437)

2 files changed, 9 insertions, 9 deletions

diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c
index e3a610922..881a158bb 100644
--- a/src/pq/pq_connect.c
+++ b/src/pq/pq_connect.c
@@ -172,6 +172,8 @@ apply_patch (struct GNUNET_PQ_Context *db,
                                   "-f",
                                   buf,
                                   "-q",
+                                  "--set",
+                                  "ON_ERROR_STOP=1",
                                   NULL);
   if (NULL == psql)
   {
@@ -415,7 +417,7 @@ GNUNET_PQ_reconnect (struct GNUNET_PQ_Context *db)
                            db->load_path))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to load SQL statements from `%s'\n",
+                  "Failed to load SQL statements from `%s*'\n",
                   db->load_path);
       PQfinish (db->conn);
       db->conn = NULL;
diff --git a/src/util/disk.c b/src/util/disk.c
index 6560726ea..c95e9753c 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1377,14 +1377,13 @@ GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h,
                       enum GNUNET_DISK_MapType access,
                       size_t len)
 {
+  int prot;
+
   if (NULL == h)
   {
     errno = EINVAL;
     return NULL;
   }
-
-  int prot;
-
   prot = 0;
   if (access & GNUNET_DISK_MAP_TYPE_READ)
     prot = PROT_READ;
@@ -1405,22 +1404,21 @@ GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h,
 
 /**
  * Unmap a file
+ *
  * @param h mapping handle
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
 GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h)
 {
   int ret;
 
-  if (h == NULL)
+  if (NULL == h)
   {
     errno = EINVAL;
     return GNUNET_SYSERR;
   }
-
   ret = munmap (h->addr, h->len) != -1 ? GNUNET_OK : GNUNET_SYSERR;
-
   GNUNET_free (h);
   return ret;
 }
@@ -1429,7 +1427,7 @@ GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h)
 /**
  * Write file changes to disk
  * @param h handle to an open file
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
 GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h)