GNUNET_free_non_null -> GNUNET_free

4 files changed, 6 insertions, 6 deletions

diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 45cb66c1d..67f6571c5 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -819,7 +819,7 @@ GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p)
     msg->port = p->id;
     GNUNET_MQ_send (p->cadet->mq, env);
   }
-  GNUNET_free_non_null (p->handlers);
+  GNUNET_free (p->handlers);
   GNUNET_free (p);
 }
 
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 03af3d5c0..f3767fb01 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -415,7 +415,7 @@ shutdown_rest ()
   }
   GCD_shutdown ();
   GCH_shutdown ();
-  GNUNET_free_non_null (my_private_key);
+  GNUNET_free (my_private_key);
   my_private_key = NULL;
 }
 
diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/cadet/gnunet-service-cadet_hello.c
index 21870a454..c7857032b 100644
--- a/src/cadet/gnunet-service-cadet_hello.c
+++ b/src/cadet/gnunet-service-cadet_hello.c
@@ -75,7 +75,7 @@ got_hello (void *cls,
   if (0 == GNUNET_memcmp (id,
                           &my_full_id))
   {
-    GNUNET_free_non_null (mine);
+    GNUNET_free (mine);
     mine = (struct GNUNET_HELLO_Message *) GNUNET_copy_message (&hello->header);
     GCD_hello_update ();
     return;
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 55800b88c..e5885278b 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -345,8 +345,8 @@ destroy_peer (void *cls)
                  GNUNET_CONTAINER_multipeermap_remove (peers,
                                                        &cp->pid,
                                                        cp));
-  GNUNET_free_non_null (cp->path_heads);
-  GNUNET_free_non_null (cp->path_tails);
+  GNUNET_free (cp->path_heads);
+  GNUNET_free (cp->path_tails);
   cp->path_dll_length = 0;
   if (NULL != cp->search_h)
   {
@@ -376,7 +376,7 @@ destroy_peer (void *cls)
     GNUNET_SCHEDULER_cancel (cp->heap_cleanup_task);
     cp->heap_cleanup_task = NULL;
   }
-  GNUNET_free_non_null (cp->hello);
+  GNUNET_free (cp->hello);
   /* Peer should not be freed if paths exist; if there are no paths,
      there ought to be no connections, and without connections, no
      notifications. Thus we can assert that mqm_head is empty at this