-rps: merge duplicate functions

[oweals/gnunet.git] / src / pq / pq.c

diff --git a/src/pq/pq.c b/src/pq/pq.c
index fe796044ef1cfe6dfc48402e95290d762cdc753e..43186c41e7142d8f4db60d6b14ac6a8c2816c181 100644 (file)
--- a/src/pq/pq.c
+++ b/src/pq/pq.c
@@ -21,7 +21,7 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
+#include "gnunet_util_lib.h"
 #include "gnunet_pq_lib.h"
 
 
@@ -151,11 +151,9 @@ GNUNET_PQ_extract_result (PGresult *result,
                      &spec->dst_size,
                      spec->dst);
     if (GNUNET_SYSERR == ret)
-      return GNUNET_SYSERR;
-    if (GNUNET_NO == ret)
     {
-      had_null = GNUNET_YES;
-      continue;
+      GNUNET_PQ_cleanup_result (rs);
+      return GNUNET_SYSERR;
     }
     if (NULL != spec->result_size)
       *spec->result_size = spec->dst_size;