3 files changed, 38 insertions, 18 deletions

diff --git a/src/pq/pq.c b/src/pq/pq.c
index b260aa1db..130ff355f 100644
--- a/src/pq/pq.c
+++ b/src/pq/pq.c
@@ -95,6 +95,11 @@ GNUNET_PQ_exec_prepared (struct GNUNET_PQ_Context *db,
                           param_lengths,
                           param_formats,
                           1);
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+                     "pq",
+                     "Execution of prepared SQL statement `%s' finished (%d)\n",
+                     name,
+                     PGRES_COMMAND_OK == PQresultStatus (res));
     if ( (PGRES_COMMAND_OK != PQresultStatus (res)) &&
          (CONNECTION_OK != (status = PQstatus (db->conn))) )
     {
@@ -163,6 +168,9 @@ GNUNET_PQ_extract_result (PGresult *result,
                   spec->fname);
       goto cleanup;
     case GNUNET_SYSERR:
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to extract field `%s'\n",
+                  spec->fname);
       GNUNET_break (0);
       goto cleanup;
     }
diff --git a/src/pq/pq_exec.c b/src/pq/pq_exec.c
index 464fff4b4..dcde331b6 100644
--- a/src/pq/pq_exec.c
+++ b/src/pq/pq_exec.c
@@ -86,6 +86,11 @@ GNUNET_PQ_exec_statements (struct GNUNET_PQ_Context *db,
                 db);
     result = PQexec (db->conn,
                      es[i].sql);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Running statement `%s' on %p finished (%d)\n",
+                es[i].sql,
+                db,
+                PGRES_COMMAND_OK == PQresultStatus (result));
     if ((GNUNET_NO == es[i].ignore_errors) &&
         (PGRES_COMMAND_OK != PQresultStatus (result)))
     {
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index 23fb4f96e..f264603f4 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -127,10 +127,13 @@ GNUNET_PQ_result_spec_variable_size (const char *name,
                                      void **dst,
                                      size_t *sptr)
 {
-  struct GNUNET_PQ_ResultSpec res =
-  { &extract_varsize_blob,
-    &clean_varsize_blob, NULL,
-    (void *) (dst), 0, name, sptr };
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = &extract_varsize_blob,
+    .cleaner = &clean_varsize_blob,
+    .dst = (void *) (dst),
+    .fname = name,
+    .result_size = sptr
+  };
 
   return res;
 }
@@ -207,10 +210,12 @@ GNUNET_PQ_result_spec_fixed_size (const char *name,
                                   void *dst,
                                   size_t dst_size)
 {
-  struct GNUNET_PQ_ResultSpec res =
-  { &extract_fixed_blob,
-    NULL, NULL,
-    (dst), dst_size, name, NULL };
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = &extract_fixed_blob,
+    .dst = (dst),
+    .dst_size = dst_size,
+    .fname = name
+  };
 
   return res;
 }
@@ -301,11 +306,12 @@ struct GNUNET_PQ_ResultSpec
 GNUNET_PQ_result_spec_rsa_public_key (const char *name,
                                       struct GNUNET_CRYPTO_RsaPublicKey **rsa)
 {
-  struct GNUNET_PQ_ResultSpec res =
-  { &extract_rsa_public_key,
-    &clean_rsa_public_key,
-    NULL,
-    (void *) rsa, 0, name, NULL };
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = &extract_rsa_public_key,
+    .cleaner = &clean_rsa_public_key,
+    .dst = (void *) rsa,
+    .fname = name
+  };
 
   return res;
 }
@@ -395,11 +401,12 @@ struct GNUNET_PQ_ResultSpec
 GNUNET_PQ_result_spec_rsa_signature (const char *name,
                                      struct GNUNET_CRYPTO_RsaSignature **sig)
 {
-  struct GNUNET_PQ_ResultSpec res =
-  { &extract_rsa_signature,
-    &clean_rsa_signature,
-    NULL,
-    (void *) sig, 0, (name), NULL };
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = &extract_rsa_signature,
+    .cleaner = &clean_rsa_signature,
+    .dst = (void *) sig,
+    .fname = name
+  };
 
   return res;
 }