From 30361fe0e89a72e2dd248a93824b06d858e4e81a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 21 Apr 2020 00:54:49 +0200
Subject: make GNUNET_freez default, have GNUNET_free_nz for cases where that
 does not work

---
 src/pt/gnunet-daemon-pt.c | 2 +-
 src/pt/test_gns_vpn.c     | 5 +++--
 src/pt/test_gnunet_vpn.c  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/pt')

diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c
index f8765818b..bcc913bd2 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -1317,7 +1317,7 @@ main (int argc,
                              NULL))
         ? 0
         : 1;
-  GNUNET_free ((void *) argv);
+  GNUNET_free_nz ((void *) argv);
   return ret;
 }
 
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 9bf497b16..69afca789 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -45,6 +45,7 @@
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_testing_lib.h"
+#include "gnunet_mhd_compat.h"
 
 #define PORT 8080
 #define TEST_DOMAIN "www.gnu"
@@ -121,7 +122,7 @@ copy_buffer (void *ptr,
 }
 
 
-static int
+static MHD_RESULT
 mhd_ahc (void *cls,
          struct MHD_Connection *connection,
          const char *url,
@@ -611,7 +612,7 @@ identity_cb (void *cls,
                                        1, &rd,
                                        &commence_testing,
                                        NULL);
-  GNUNET_free ((void **) rd.data);
+  GNUNET_free_nz ((void **) rd.data);
   GNUNET_free (rd_string);
 }
 
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index 42fd52c38..cb9bb61fe 100644
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -29,6 +29,7 @@
 #include <microhttpd.h>
 #include "gnunet_vpn_service.h"
 #include "gnunet_testing_lib.h"
+#include "gnunet_mhd_compat.h"
 
 #define PORT 48080
 
@@ -96,7 +97,7 @@ copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx)
 }
 
 
-static int
+static MHD_RESULT
 mhd_ahc (void *cls,
          struct MHD_Connection *connection,
          const char *url,
-- 
cgit v1.2.3