GNUNET_free_non_null -> GNUNET_free

3 files changed, 8 insertions, 8 deletions

diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index 5012d6455..0743a478d 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -392,15 +392,15 @@ run (void *cls,
                                            &stun_read_task,
                                            NULL);
   }
-  GNUNET_free_non_null (remote_sa);
-  GNUNET_free_non_null (local_sa);
+  GNUNET_free (remote_sa);
+  GNUNET_free (local_sa);
   test_finished ();
   return;
 fail_and_shutdown:
   global_ret = 1;
   GNUNET_SCHEDULER_shutdown ();
-  GNUNET_free_non_null (remote_sa);
-  GNUNET_free_non_null (local_sa);
+  GNUNET_free (remote_sa);
+  GNUNET_free (local_sa);
 }
 
 
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c
index 3b7d48c82..4dcc0312f 100644
--- a/src/nat/gnunet-service-nat.c
+++ b/src/nat/gnunet-service-nat.c
@@ -2009,7 +2009,7 @@ client_disconnect_cb (void *cls,
       ch->caddrs[i].mh = NULL;
     }
   }
-  GNUNET_free_non_null (ch->caddrs);
+  GNUNET_free (ch->caddrs);
   while (NULL != (lal = ch->ext_addr_head))
   {
     GNUNET_CONTAINER_DLL_remove (ch->ext_addr_head,
@@ -2032,8 +2032,8 @@ client_disconnect_cb (void *cls,
     GNUNET_RESOLVER_request_cancel (ch->ext_dns);
     ch->ext_dns = NULL;
   }
-  GNUNET_free_non_null (ch->hole_external);
-  GNUNET_free_non_null (ch->section_name);
+  GNUNET_free (ch->hole_external);
+  GNUNET_free (ch->section_name);
   GNUNET_free (ch);
 }
 
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 69a2f4218..a3072f712 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -108,7 +108,7 @@ process_if (void *cls,
 
   if (addr == NULL)
     return GNUNET_OK;
-  GNUNET_free_non_null (data->addr);
+  GNUNET_free (data->addr);
   data->addr = GNUNET_malloc (addrlen);
   GNUNET_memcpy (data->addr, addr, addrlen);
   data->addrlen = addrlen;