[gnunet] branch master updated: -fix build issues

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 3c47c0ae9 -fix build issues
3c47c0ae9 is described below

commit 3c47c0ae92ec5ec93075fb44caa412a54996351e
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jun 25 14:06:51 2023 +0200

    -fix build issues
---
 src/pq/pq.c               | 4 ++--
 src/pq/pq_query_helper.c  | 2 +-
 src/pq/pq_result_helper.c | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pq/pq.c b/src/pq/pq.c
index 6d47f4748..65e051bfc 100644
--- a/src/pq/pq.c
+++ b/src/pq/pq.c
@@ -24,8 +24,8 @@
  * @author Florian Dold
  * @author Christian Grothoff
  */
-#include "gnunet_pq_lib.h"
 #include "platform.h"
+#include "gnunet_pq_lib.h"
 #include "pq.h"
 
 
@@ -195,7 +195,7 @@ GNUNET_PQ_extract_result (PGresult *result,
       *spec->result_size = spec->dst_size;
   }
   return GNUNET_OK;
-  cleanup:
+cleanup:
   for (unsigned int j = 0; j < i; j++)
     if (NULL != rs[j].cleaner)
       rs[j].cleaner (rs[j].cls,
diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index f57fb338c..932f3cb0b 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -22,10 +22,10 @@
  * @brief functions to initialize parameter arrays
  * @author Christian Grothoff
  */
+#include "platform.h"
 #include "gnunet_common.h"
 #include "gnunet_pq_lib.h"
 #include "gnunet_time_lib.h"
-#include "platform.h"
 #include "pq.h"
 
 
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index f849ffde1..cdb7fcbc4 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -22,9 +22,8 @@
  * @brief functions to extract result values
  * @author Christian Grothoff
  */
-#include "gnunet_common.h"
-#include "gnunet_time_lib.h"
 #include "platform.h"
+#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_pq_lib.h"
 #include "pq.h"
@@ -1299,6 +1298,8 @@ extract_array_generic (
   }
 
   *((void **) dst) = out;
+  if (NULL == out)
+    return GNUNET_OK; /* array length must be 0 */
 
   /* copy data */
   {

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.