GNUNET_free_non_null -> GNUNET_free

3 files changed, 12 insertions, 12 deletions

diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c
index c2e8f5d88..5dc2e7f2a 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -790,7 +790,7 @@ clean_up ()
     curl_easy_cleanup (curl);
     curl = NULL;
   }
-  GNUNET_free_non_null (current_url);
+  GNUNET_free (current_url);
   current_url = NULL;
   stat_bytes_downloaded = 0;
   stat_download_in_progress = GNUNET_NO;
@@ -1460,7 +1460,7 @@ load_hostlist_file ()
                          linked_list_size,
                          GNUNET_NO);
 
-  GNUNET_free_non_null (uri);
+  GNUNET_free (uri);
   emsg = NULL;
   (void) GNUNET_BIO_read_close (rh, &emsg);
   if (emsg != NULL)
@@ -1657,15 +1657,15 @@ GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c,
         GNUNET_free (proxytype_str);
         GNUNET_free (proxy);
         proxy = NULL;
-        GNUNET_free_non_null (proxy_username);
+        GNUNET_free (proxy_username);
         proxy_username = NULL;
-        GNUNET_free_non_null (proxy_password);
+        GNUNET_free (proxy_password);
         proxy_password = NULL;
 
         return GNUNET_SYSERR;
       }
     }
-    GNUNET_free_non_null (proxytype_str);
+    GNUNET_free (proxytype_str);
   }
 
   stat_learning = learn;
@@ -1786,11 +1786,11 @@ GNUNET_HOSTLIST_client_stop ()
     ti_check_download = NULL;
     curl_global_cleanup ();
   }
-  GNUNET_free_non_null (proxy);
+  GNUNET_free (proxy);
   proxy = NULL;
-  GNUNET_free_non_null (proxy_username);
+  GNUNET_free (proxy_username);
   proxy_username = NULL;
-  GNUNET_free_non_null (proxy_password);
+  GNUNET_free (proxy_password);
   proxy_password = NULL;
   if (NULL != pi)
   {
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c
index 999730e3e..b6c0495c0 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/hostlist/gnunet-daemon-hostlist_server.c
@@ -229,7 +229,7 @@ host_processor (void *cls,
   {
     GNUNET_assert (NULL == peer);
     builder->pitr = NULL;
-    GNUNET_free_non_null (builder->data);
+    GNUNET_free (builder->data);
     GNUNET_free (builder);
     builder = NULL;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -534,7 +534,7 @@ process_notify (void *cls,
       GNUNET_PEERINFO_iterate_cancel (builder->pitr);
       builder->pitr = NULL;
     }
-    GNUNET_free_non_null (builder->data);
+    GNUNET_free (builder->data);
     builder->size = 0;
     builder->data = NULL;
   }
@@ -886,7 +886,7 @@ GNUNET_HOSTLIST_server_stop ()
       GNUNET_PEERINFO_iterate_cancel (builder->pitr);
       builder->pitr = NULL;
     }
-    GNUNET_free_non_null (builder->data);
+    GNUNET_free (builder->data);
     GNUNET_free (builder);
     builder = NULL;
   }
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index a45721521..a50e7acc2 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -390,7 +390,7 @@ handle_ad_arrive (void *cls,
                 expected_uri,
                 current_adv_uri);
   GNUNET_free (expected_uri);
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
 }