GNUNET_free_non_null -> GNUNET_free

6 files changed, 12 insertions, 12 deletions

diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index c6443f102..1eaed8a5c 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -1258,7 +1258,7 @@ GNUNET_DHT_monitor_stop (struct GNUNET_DHT_MonitorHandle *mh)
   }
   GNUNET_MQ_send (handle->mq,
                   env);
-  GNUNET_free_non_null (mh->key);
+  GNUNET_free (mh->key);
   GNUNET_free (mh);
 }
 
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 2dd49a1b6..da46dcfee 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -69,7 +69,7 @@ static void
 process_hello (void *cls,
                const struct GNUNET_MessageHeader *message)
 {
-  GNUNET_free_non_null (GDS_my_hello);
+  GNUNET_free (GDS_my_hello);
   GDS_my_hello = GNUNET_malloc (ntohs (message->size));
   GNUNET_memcpy (GDS_my_hello,
                  message,
@@ -106,7 +106,7 @@ shutdown_task (void *cls)
                                GNUNET_YES);
     GDS_stats = NULL;
   }
-  GNUNET_free_non_null (GDS_my_hello);
+  GNUNET_free (GDS_my_hello);
   GDS_my_hello = NULL;
   GDS_CLIENTS_stop ();
 }
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index be6e22d01..1e44c1fad 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -333,7 +333,7 @@ client_disconnect_cb (void *cls,
       struct ClientMonitorRecord *next;
 
       next = monitor->next;
-      GNUNET_free_non_null (monitor->key);
+      GNUNET_free (monitor->key);
       GNUNET_CONTAINER_DLL_remove (monitor_head,
                                    monitor_tail,
                                    monitor);
@@ -938,7 +938,7 @@ handle_dht_local_monitor_stop (void *cls,
       GNUNET_CONTAINER_DLL_remove (monitor_head,
                                    monitor_tail,
                                    r);
-      GNUNET_free_non_null (r->key);
+      GNUNET_free (r->key);
       GNUNET_free (r);
       return;     /* Delete only ONE entry */
     }
@@ -1281,7 +1281,7 @@ GDS_CLIENTS_process_get (uint32_t options,
                       env);
     }
   }
-  GNUNET_free_non_null (cl);
+  GNUNET_free (cl);
 }
 
 
@@ -1363,7 +1363,7 @@ GDS_CLIENTS_process_get_resp (enum GNUNET_BLOCK_Type type,
                       env);
     }
   }
-  GNUNET_free_non_null (cl);
+  GNUNET_free (cl);
 }
 
 
@@ -1445,7 +1445,7 @@ GDS_CLIENTS_process_put (uint32_t options,
                       env);
     }
   }
-  GNUNET_free_non_null (cl);
+  GNUNET_free (cl);
 }
 
 
diff --git a/src/dht/gnunet-service-dht_hello.c b/src/dht/gnunet-service-dht_hello.c
index a0141d1fb..906391334 100644
--- a/src/dht/gnunet-service-dht_hello.c
+++ b/src/dht/gnunet-service-dht_hello.c
@@ -86,7 +86,7 @@ process_hello (void *cls,
                             gettext_noop ("# HELLOs obtained from peerinfo"), 1,
                             GNUNET_NO);
   hm = GNUNET_CONTAINER_multipeermap_get (peer_to_hello, peer);
-  GNUNET_free_non_null (hm);
+  GNUNET_free (hm);
   hm = GNUNET_malloc (GNUNET_HELLO_size (hello));
   GNUNET_memcpy (hm, hello, GNUNET_HELLO_size (hello));
   GNUNET_assert (GNUNET_SYSERR !=
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index fce69d3f6..b211fca6b 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -1436,7 +1436,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type,
   if (msize + sizeof(struct PeerGetMessage) >= GNUNET_MAX_MESSAGE_SIZE)
   {
     GNUNET_break (0);
-    GNUNET_free_non_null (reply_bf);
+    GNUNET_free (reply_bf);
     GNUNET_free (targets);
     return GNUNET_NO;
   }
@@ -1493,7 +1493,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type,
                     env);
   }
   GNUNET_free (targets);
-  GNUNET_free_non_null (reply_bf);
+  GNUNET_free (reply_bf);
   return (skip_count < target_count) ? GNUNET_OK : GNUNET_NO;
 }
 
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c
index 5a73880be..ba50c3d1a 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -323,7 +323,7 @@ do_shutdown (void *cls)
     GNUNET_TESTBED_operation_done (bandwidth_stats_op);
     bandwidth_stats_op = NULL;
   }
-  GNUNET_free_non_null (a_ac);
+  GNUNET_free (a_ac);
 }