27 files changed, 106 insertions, 107 deletions

diff --git a/src/util/bio.c b/src/util/bio.c
index ce15f073b..b27230240 100644
--- a/src/util/bio.c
+++ b/src/util/bio.c
@@ -171,7 +171,7 @@ GNUNET_BIO_read_close (struct GNUNET_BIO_ReadHandle *h, char **emsg)
   if (NULL != emsg)
     *emsg = h->emsg;
   else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
   switch (h->type)
   {
   case IO_FILE:
@@ -345,7 +345,7 @@ GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h,
       GNUNET_asprintf (&h->emsg,
                        _ ("Error reading length of string `%s'"),
                        what);
-    GNUNET_free_non_null (tmp);
+    GNUNET_free (tmp);
     return GNUNET_SYSERR;
   }
   if (0 == big)
@@ -612,7 +612,7 @@ GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h, char **emsg)
   if (NULL != emsg)
     *emsg = h->emsg;
   else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
   switch (h->type)
   {
   case IO_FILE:
@@ -623,7 +623,7 @@ GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h, char **emsg)
       if (NULL != emsg)
         *emsg = h->emsg;
       else
-        GNUNET_free_non_null (h->emsg);
+        GNUNET_free (h->emsg);
       err = GNUNET_SYSERR;
     }
     else
@@ -663,7 +663,7 @@ GNUNET_BIO_flush (struct GNUNET_BIO_WriteHandle *h)
   {
     GNUNET_DISK_file_close (h->fd);
     h->fd = NULL;
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
     GNUNET_asprintf (&h->emsg, _ ("Unable to flush buffer to file"));
     return GNUNET_SYSERR;
   }
@@ -698,7 +698,7 @@ GNUNET_BIO_get_buffer_contents (struct GNUNET_BIO_WriteHandle *h,
   if (NULL != emsg)
     *emsg = h->emsg;
   else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
   *contents = GNUNET_buffer_reap ((struct GNUNET_Buffer *) h->buffer, size);
   return ret;
 }
@@ -750,7 +750,7 @@ write_to_file (struct GNUNET_BIO_WriteHandle *h,
                        _ ("Error while writing `%s' to file: %s"),
                        what,
                        tmp);
-      GNUNET_free_non_null (tmp);
+      GNUNET_free (tmp);
       return GNUNET_SYSERR;
     }
   }
@@ -870,7 +870,7 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
   if (-1 == size)
   {
     GNUNET_free (buf);
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
     GNUNET_asprintf (&h->emsg,
                      _ ("Failed to serialize metadata `%s'"),
                      what);
diff --git a/src/util/buffer.c b/src/util/buffer.c
index c865f6307..d0261889e 100644
--- a/src/util/buffer.c
+++ b/src/util/buffer.c
@@ -162,7 +162,7 @@ GNUNET_buffer_reap (struct GNUNET_Buffer *buf, size_t *size)
 void
 GNUNET_buffer_clear (struct GNUNET_Buffer *buf)
 {
-  GNUNET_free_non_null (buf->mem);
+  GNUNET_free (buf->mem);
   memset (buf, 0, sizeof (struct GNUNET_Buffer));
 }
 
diff --git a/src/util/client.c b/src/util/client.c
index a7b1a2a0f..86dabe664 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -422,7 +422,7 @@ connection_client_destroy_impl (struct GNUNET_MQ_Handle *mq,
   }
   cancel_aps (cstate);
   GNUNET_free (cstate->service_name);
-  GNUNET_free_non_null (cstate->hostname);
+  GNUNET_free (cstate->hostname);
   GNUNET_MST_destroy (cstate->mst);
   GNUNET_free (cstate);
 }
@@ -563,7 +563,7 @@ try_unixpath (const char *service_name,
     if (NULL != sock)
       GNUNET_NETWORK_socket_close (sock);
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
 #endif
   return NULL;
 }
@@ -747,7 +747,7 @@ test_service_configuration (const char *service_name,
                                _ ("not a valid filename"));
     return GNUNET_SYSERR;   /* UNIXPATH specified but invalid! */
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
 #endif
 
   if ((GNUNET_YES ==
@@ -768,7 +768,7 @@ test_service_configuration (const char *service_name,
                                               &hostname)) &&
       (0 != strlen (hostname)))
     ret = GNUNET_OK;
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
   return ret;
 }
 
@@ -1043,7 +1043,7 @@ GNUNET_CLIENT_test (const struct GNUNET_CONFIGURATION_Handle *cfg,
     /* service running remotely */
     ret = GNUNET_OK;
   }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
   return ret;
 }
 
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index fd91e23b2..4aad49777 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -323,13 +323,12 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
  * want to keep track of allocations.
  *
  * @param ptr the pointer to free
- * @param filename where in the code was the call to GNUNET_free
- * @param linenumber where in the code was the call to GNUNET_free
+ * @param filename where in the code was the call to GNUNET_free()
+ * @param linenumber where in the code was the call to GNUNET_free()
  */
 void
 GNUNET_xfree_ (void *ptr, const char *filename, int linenumber)
 {
-  GNUNET_assert_at (NULL != ptr, filename, linenumber);
 #ifdef W32_MEM_LIMIT
   ptr = &((size_t *) ptr)[-1];
   mem_used -= *((size_t *) ptr);
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 3894cdda1..b30175543 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -715,9 +715,9 @@ GNUNET_log_setup (const char *comp,
 #if ! defined(GNUNET_CULL_LOGGING)
   parse_all_definitions ();
 #endif
-  GNUNET_free_non_null (component);
+  GNUNET_free (component);
   GNUNET_asprintf (&component, "%s-%d", comp, getpid ());
-  GNUNET_free_non_null (component_nopid);
+  GNUNET_free (component_nopid);
   component_nopid = GNUNET_strdup (comp);
 
   env_logfile = getenv ("GNUNET_FORCE_LOGFILE");
@@ -725,7 +725,7 @@ GNUNET_log_setup (const char *comp,
     logfile = env_logfile;
   if (NULL == logfile)
     return GNUNET_OK;
-  GNUNET_free_non_null (log_file_name);
+  GNUNET_free (log_file_name);
   log_file_name = GNUNET_STRINGS_filename_expand (logfile);
   if (NULL == log_file_name)
     return GNUNET_SYSERR;
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 7ed87cc1e..34ecc9e73 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -286,7 +286,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
   line_orig = NULL;
   while (r_bytes < size)
   {
-    GNUNET_free_non_null (line_orig);
+    GNUNET_free (line_orig);
     /* fgets-like behaviour on buffer */
     to_read = size - r_bytes;
     pos = memchr (&mem[r_bytes], '\n', to_read);
@@ -404,7 +404,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
     ret = GNUNET_SYSERR;
     break;
   }
-  GNUNET_free_non_null (line_orig);
+  GNUNET_free (line_orig);
   GNUNET_free (section);
   GNUNET_assert ((GNUNET_OK != ret) || (r_bytes == size));
   return ret;
@@ -734,7 +734,7 @@ GNUNET_CONFIGURATION_remove_section (struct GNUNET_CONFIGURATION_Handle *cfg,
       {
         spos->entries = ent->next;
         GNUNET_free (ent->key);
-        GNUNET_free_non_null (ent->val);
+        GNUNET_free (ent->val);
         GNUNET_free (ent);
         cfg->dirty = GNUNET_YES;
       }
@@ -926,13 +926,13 @@ GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg,
   {
     if (NULL == value)
     {
-      GNUNET_free_non_null (e->val);
+      GNUNET_free (e->val);
       e->val = NULL;
     }
     else
     {
       nv = GNUNET_strdup (value);
-      GNUNET_free_non_null (e->val);
+      GNUNET_free (e->val);
       e->val = nv;
     }
     return;
@@ -1383,7 +1383,7 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg,
   result = GNUNET_malloc (strlen (prefix) + strlen (post) + 1);
   strcpy (result, prefix);
   strcat (result, post);
-  GNUNET_free_non_null (def);
+  GNUNET_free (def);
   GNUNET_free (prefix);
   GNUNET_free (orig);
   return result;
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index eca651862..d7460043d 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -707,7 +707,7 @@ GNUNET_CONTAINER_bloomfilter_free (struct GNUNET_CONTAINER_BloomFilter *bf)
     return;
   if (bf->fh != NULL)
     GNUNET_DISK_file_close (bf->fh);
-  GNUNET_free_non_null (bf->filename);
+  GNUNET_free (bf->filename);
   GNUNET_free (bf->bitArray);
   GNUNET_free (bf);
 }
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index ad362408e..b66a7b258 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -217,9 +217,9 @@ GNUNET_CONTAINER_meta_data_create ()
 static void
 meta_item_free (struct MetaItem *mi)
 {
-  GNUNET_free_non_null (mi->plugin_name);
-  GNUNET_free_non_null (mi->mime_type);
-  GNUNET_free_non_null (mi->data);
+  GNUNET_free (mi->plugin_name);
+  GNUNET_free (mi->mime_type);
+  GNUNET_free (mi->data);
   GNUNET_free (mi);
 }
 
@@ -258,7 +258,7 @@ GNUNET_CONTAINER_meta_data_destroy (struct GNUNET_CONTAINER_MetaData *md)
     GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, pos);
     meta_item_free (pos);
   }
-  GNUNET_free_non_null (md->sbuf);
+  GNUNET_free (md->sbuf);
   GNUNET_free (md);
 }
 
@@ -280,7 +280,7 @@ GNUNET_CONTAINER_meta_data_clear (struct GNUNET_CONTAINER_MetaData *md)
     GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, mi);
     meta_item_free (mi);
   }
-  GNUNET_free_non_null (md->sbuf);
+  GNUNET_free (md->sbuf);
   memset (md, 0, sizeof(struct GNUNET_CONTAINER_MetaData));
 }
 
@@ -976,7 +976,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData
     if (NULL != pos->mime_type)
       left -= strlen (pos->mime_type) + 1;
 
-    GNUNET_free_non_null (cdata);
+    GNUNET_free (cdata);
     cdata = NULL;
 
     i++;
@@ -1180,7 +1180,7 @@ GNUNET_CONTAINER_meta_data_deserialize (const char *input, size_t size)
                                        ntohl (ent.type), format, mime_type,
                                        meta_data, dlen);
   }
-  GNUNET_free_non_null (data);
+  GNUNET_free (data);
   return md;
 }
 
diff --git a/src/util/disk.c b/src/util/disk.c
index 9018aa955..cdead59d2 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1556,8 +1556,8 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
       GNUNET_break (0 == close (p->fd[0]->fd));
     if (p->fd[1]->fd >= 0)
       GNUNET_break (0 == close (p->fd[1]->fd));
-    GNUNET_free_non_null (p->fd[0]);
-    GNUNET_free_non_null (p->fd[1]);
+    GNUNET_free (p->fd[0]);
+    GNUNET_free (p->fd[1]);
     GNUNET_free (p);
     errno = eno;
     return NULL;
diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index ab687414e..401723106 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -109,8 +109,8 @@ GNUNET_DNSPARSER_free_soa (struct GNUNET_DNSPARSER_SoaRecord *soa)
 {
   if (NULL == soa)
     return;
-  GNUNET_free_non_null (soa->mname);
-  GNUNET_free_non_null (soa->rname);
+  GNUNET_free (soa->mname);
+  GNUNET_free (soa->rname);
   GNUNET_free (soa);
 }
 
@@ -125,7 +125,7 @@ GNUNET_DNSPARSER_free_cert (struct GNUNET_DNSPARSER_CertRecord *cert)
 {
   if (NULL == cert)
     return;
-  GNUNET_free_non_null (cert->certificate_data);
+  GNUNET_free (cert->certificate_data);
   GNUNET_free (cert);
 }
 
@@ -140,7 +140,7 @@ GNUNET_DNSPARSER_free_srv (struct GNUNET_DNSPARSER_SrvRecord *srv)
 {
   if (NULL == srv)
     return;
-  GNUNET_free_non_null (srv->target);
+  GNUNET_free (srv->target);
   GNUNET_free (srv);
 }
 
@@ -155,7 +155,7 @@ GNUNET_DNSPARSER_free_mx (struct GNUNET_DNSPARSER_MxRecord *mx)
 {
   if (NULL == mx)
     return;
-  GNUNET_free_non_null (mx->mxhost);
+  GNUNET_free (mx->mxhost);
   GNUNET_free (mx);
 }
 
@@ -168,7 +168,7 @@ GNUNET_DNSPARSER_free_mx (struct GNUNET_DNSPARSER_MxRecord *mx)
 void
 GNUNET_DNSPARSER_free_record (struct GNUNET_DNSPARSER_Record *r)
 {
-  GNUNET_free_non_null (r->name);
+  GNUNET_free (r->name);
   switch (r->type)
   {
   case GNUNET_DNSPARSER_TYPE_MX:
@@ -190,11 +190,11 @@ GNUNET_DNSPARSER_free_record (struct GNUNET_DNSPARSER_Record *r)
   case GNUNET_DNSPARSER_TYPE_NS:
   case GNUNET_DNSPARSER_TYPE_CNAME:
   case GNUNET_DNSPARSER_TYPE_PTR:
-    GNUNET_free_non_null (r->data.hostname);
+    GNUNET_free (r->data.hostname);
     break;
 
   default:
-    GNUNET_free_non_null (r->data.raw.data);
+    GNUNET_free (r->data.raw.data);
     break;
   }
 }
@@ -854,17 +854,17 @@ void
 GNUNET_DNSPARSER_free_packet (struct GNUNET_DNSPARSER_Packet *p)
 {
   for (unsigned int i = 0; i < p->num_queries; i++)
-    GNUNET_free_non_null (p->queries[i].name);
-  GNUNET_free_non_null (p->queries);
+    GNUNET_free (p->queries[i].name);
+  GNUNET_free (p->queries);
   for (unsigned int i = 0; i < p->num_answers; i++)
     GNUNET_DNSPARSER_free_record (&p->answers[i]);
-  GNUNET_free_non_null (p->answers);
+  GNUNET_free (p->answers);
   for (unsigned int i = 0; i < p->num_authority_records; i++)
     GNUNET_DNSPARSER_free_record (&p->authority_records[i]);
-  GNUNET_free_non_null (p->authority_records);
+  GNUNET_free (p->authority_records);
   for (unsigned int i = 0; i < p->num_additional_records; i++)
     GNUNET_DNSPARSER_free_record (&p->additional_records[i]);
-  GNUNET_free_non_null (p->additional_records);
+  GNUNET_free (p->additional_records);
   GNUNET_free (p);
 }
 
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index a56ef2d96..592875531 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -377,7 +377,7 @@ set_string (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
   (void) ctx;
   (void) option;
   GNUNET_assert (NULL != value);
-  GNUNET_free_non_null (*val);
+  GNUNET_free (*val);
   *val = GNUNET_strdup (value);
   return GNUNET_OK;
 }
@@ -458,7 +458,7 @@ set_filename (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
   (void) ctx;
   (void) option;
   GNUNET_assert (NULL != value);
-  GNUNET_free_non_null (*val);
+  GNUNET_free (*val);
   *val = GNUNET_STRINGS_filename_expand (value);
   return GNUNET_OK;
 }
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 5883c1497..2b279dda2 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -258,7 +258,7 @@ run (void *cls,
         GNUNET_CONFIGURATION_write ((NULL == out) ? diff : out, cfgfile))
       global_ret = 2;
   }
-  GNUNET_free_non_null (cfg_fn);
+  GNUNET_free (cfg_fn);
   if (NULL != out)
     GNUNET_CONFIGURATION_destroy (out);
 cleanup:
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c
index 7d13ce469..aa64144a8 100644
--- a/src/util/gnunet-scrypt.c
+++ b/src/util/gnunet-scrypt.c
@@ -323,7 +323,7 @@ main (int argc, char *const *argv)
     ? 0
     : 1;
   GNUNET_free_nz ((void *) argv);
-  GNUNET_free_non_null (pwfn);
+  GNUNET_free (pwfn);
   return ret;
 }
 
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index 357453da7..5ed70807e 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -217,7 +217,7 @@ free_cache_entry (struct ResolveCache *rc)
     GNUNET_free (pos->record);
     GNUNET_free (pos);
   }
-  GNUNET_free_non_null (rc->hostname);
+  GNUNET_free (rc->hostname);
   GNUNET_CONTAINER_DLL_remove (cache_head, cache_tail, rc);
   cache_size--;
   GNUNET_free (rc);
@@ -241,7 +241,7 @@ free_hosts_entry (struct ResolveCache *rc)
     GNUNET_free (pos->record);
     GNUNET_free (pos);
   }
-  GNUNET_free_non_null (rc->hostname);
+  GNUNET_free (rc->hostname);
   GNUNET_CONTAINER_DLL_remove (hosts_head, hosts_tail, rc);
   cache_size--;
   GNUNET_free (rc);
@@ -267,7 +267,7 @@ free_active_lookup (struct ActiveLookup *al)
     GNUNET_SCHEDULER_cancel (al->timeout_task);
     al->timeout_task = NULL;
   }
-  GNUNET_free_non_null (al->hostname);
+  GNUNET_free (al->hostname);
   GNUNET_free (al);
 }
 
@@ -1094,7 +1094,7 @@ handle_get (void *cls, const struct GNUNET_RESOLVER_GetMessage *msg)
                  client_request_id,
                  client);
   }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
 }
 
 
@@ -1115,7 +1115,7 @@ shutdown_task (void *cls)
   while (NULL != hosts_head)
     free_hosts_entry (hosts_head);
   GNUNET_DNSSTUB_stop (dnsstub_ctx);
-  GNUNET_free_non_null (my_domain);
+  GNUNET_free (my_domain);
 }
 
 
@@ -1296,7 +1296,7 @@ init_cb (void *cls,
                 GNUNET_OK == result ? "success" : "failure");
     GNUNET_free (dns_servers[i]);
   }
-  GNUNET_free_non_null (dns_servers);
+  GNUNET_free (dns_servers);
 }
 
 
diff --git a/src/util/mq.c b/src/util/mq.c
index 78dc7dba2..302b310de 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -881,7 +881,7 @@ GNUNET_MQ_destroy (struct GNUNET_MQ_Handle *mq)
     GNUNET_CONTAINER_multihashmap32_destroy (mq->assoc_map);
     mq->assoc_map = NULL;
   }
-  GNUNET_free_non_null (mq->handlers);
+  GNUNET_free (mq->handlers);
   GNUNET_free (mq);
 }
 
diff --git a/src/util/network.c b/src/util/network.c
index 223ce2080..b18030fcd 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -621,7 +621,7 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
 void
 GNUNET_NETWORK_socket_free_memory_only_ (struct GNUNET_NETWORK_Handle *desc)
 {
-  GNUNET_free_non_null (desc->addr);
+  GNUNET_free (desc->addr);
   GNUNET_free (desc);
 }
 
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 714df6957..34b88d761 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -563,11 +563,11 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
           (GNUNET_YES == GNUNET_DISK_directory_test (tmp, GNUNET_YES)))
       {
         GNUNET_free (execpath);
-        GNUNET_free_non_null (dirname);
+        GNUNET_free (dirname);
         return tmp;
       }
       GNUNET_free (tmp);
-      GNUNET_free_non_null (dirname);
+      GNUNET_free (dirname);
     }
     GNUNET_asprintf (&dirname,
                      DIR_SEPARATOR_STR "%s" DIR_SEPARATOR_STR,
@@ -643,11 +643,11 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
           (GNUNET_YES == GNUNET_DISK_directory_test (tmp, GNUNET_YES)))
       {
         GNUNET_free (execpath);
-        GNUNET_free_non_null (dirname);
+        GNUNET_free (dirname);
         return tmp;
       }
       GNUNET_free (tmp);
-      GNUNET_free_non_null (dirname);
+      GNUNET_free (dirname);
     }
     GNUNET_asprintf (&dirname,
                      DIR_SEPARATOR_STR "%s" DIR_SEPARATOR_STR
diff --git a/src/util/program.c b/src/util/program.c
index 5ad069edd..8bda34b4f 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -342,10 +342,10 @@ GNUNET_PROGRAM_run2 (int argc,
   ret = GNUNET_OK;
 cleanup:
   GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (cc.cfgfile);
-  GNUNET_free_non_null (cfg_fn);
-  GNUNET_free_non_null (loglev);
-  GNUNET_free_non_null (logfile);
+  GNUNET_free (cc.cfgfile);
+  GNUNET_free (cfg_fn);
+  GNUNET_free (loglev);
+  GNUNET_free (logfile);
   return ret;
 }
 
diff --git a/src/util/regex.c b/src/util/regex.c
index d3ab35652..fed325cd6 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -174,10 +174,10 @@ num_to_regex (uint16_t value,
     GNUNET_asprintf (&ret,
                      "%s%s%s%s",
                      a, b, c, d);
-  GNUNET_free_non_null (a);
-  GNUNET_free_non_null (b);
-  GNUNET_free_non_null (c);
-  GNUNET_free_non_null (d);
+  GNUNET_free (a);
+  GNUNET_free (b);
+  GNUNET_free (c);
+  GNUNET_free (d);
   return ret;
 }
 
@@ -607,7 +607,7 @@ address_to_regex (const void *addr,
     reg = num_to_regex (a[i], m[i]);
     if (NULL == reg)
     {
-      GNUNET_free_non_null (ret);
+      GNUNET_free (ret);
       return NULL;
     }
     if (NULL == ret)
@@ -721,7 +721,7 @@ GNUNET_TUN_ipv4policy2regex (const char *policy)
     line = ipv4_to_regex (&np[i]);
     if (NULL == line)
     {
-      GNUNET_free_non_null (reg);
+      GNUNET_free (reg);
       GNUNET_free (np);
       return NULL;
     }
@@ -777,7 +777,7 @@ GNUNET_TUN_ipv6policy2regex (const char *policy)
     line = ipv6_to_regex (&np[i]);
     if (NULL == line)
     {
-      GNUNET_free_non_null (reg);
+      GNUNET_free (reg);
       GNUNET_free (np);
       return NULL;
     }
diff --git a/src/util/service.c b/src/util/service.c
index ea078b19b..1b80c8d13 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1144,7 +1144,7 @@ get_server_addresses (const char *service_name,
           (EACCES == errno))
       {
         LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
-        GNUNET_free_non_null (hostname);
+        GNUNET_free (hostname);
         GNUNET_free (unixpath);
         return GNUNET_SYSERR;
       }
@@ -1170,7 +1170,7 @@ get_server_addresses (const char *service_name,
          _ (
            "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
          service_name);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (hostname);
     return GNUNET_SYSERR;
   }
   if (0 == port)
@@ -1178,8 +1178,8 @@ get_server_addresses (const char *service_name,
     saddrs = GNUNET_new_array (2, struct sockaddr *);
     saddrlens = GNUNET_new_array (2, socklen_t);
     add_unixpath (saddrs, saddrlens, unixpath);
-    GNUNET_free_non_null (unixpath);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (unixpath);
+    GNUNET_free (hostname);
     *addrs = saddrs;
     *addr_lens = saddrlens;
     return 1;
@@ -1203,7 +1203,7 @@ get_server_addresses (const char *service_name,
            hostname,
            gai_strerror (ret));
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     next = res;
@@ -1223,7 +1223,7 @@ get_server_addresses (const char *service_name,
            hostname);
       freeaddrinfo (res);
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     resi = i;
@@ -1330,7 +1330,7 @@ get_server_addresses (const char *service_name,
       ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
     }
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
   *addrs = saddrs;
   *addr_lens = saddrlens;
   return resi;
@@ -1557,8 +1557,8 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
       }
       GNUNET_CONTAINER_DLL_insert (sh->slc_head, sh->slc_tail, slc);
     }
-    GNUNET_free_non_null (addrlens);
-    GNUNET_free_non_null (addrs);
+    GNUNET_free (addrlens);
+    GNUNET_free (addrs);
     if ((0 != num) && (NULL == sh->slc_head))
     {
       /* All attempts to bind failed, hard failure */
@@ -1566,7 +1566,7 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
         GNUNET_ERROR_TYPE_ERROR,
         _ (
           "Could not bind to any of the ports I was supposed to, refusing to run!\n"));
-      GNUNET_free_non_null (csocks);
+      GNUNET_free (csocks);
       return GNUNET_SYSERR;
     }
   }
@@ -1793,10 +1793,10 @@ teardown_service (struct GNUNET_SERVICE_Handle *sh)
 {
   struct ServiceListenContext *slc;
 
-  GNUNET_free_non_null (sh->v4_denied);
-  GNUNET_free_non_null (sh->v6_denied);
-  GNUNET_free_non_null (sh->v4_allowed);
-  GNUNET_free_non_null (sh->v6_allowed);
+  GNUNET_free (sh->v4_denied);
+  GNUNET_free (sh->v6_denied);
+  GNUNET_free (sh->v4_allowed);
+  GNUNET_free (sh->v6_allowed);
   while (NULL != (slc = sh->slc_head))
   {
     GNUNET_CONTAINER_DLL_remove (sh->slc_head, sh->slc_tail, slc);
@@ -1890,7 +1890,7 @@ GNUNET_SERVICE_start (const char *service_name,
   sh->handlers = GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
   if (GNUNET_OK != setup_service (sh))
   {
-    GNUNET_free_non_null (sh->handlers);
+    GNUNET_free (sh->handlers);
     GNUNET_free (sh);
     return NULL;
   }
@@ -1913,7 +1913,7 @@ GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Handle *srv)
   while (NULL != (client = srv->clients_head))
     GNUNET_SERVICE_client_drop (client);
   teardown_service (srv);
-  GNUNET_free_non_null (srv->handlers);
+  GNUNET_free (srv->handlers);
   GNUNET_free (srv);
 }
 
@@ -2159,13 +2159,13 @@ shutdown:
   }
 #endif
   teardown_service (&sh);
-  GNUNET_free_non_null (sh.handlers);
+  GNUNET_free (sh.handlers);
   GNUNET_SPEEDUP_stop_ ();
   GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (logfile);
-  GNUNET_free_non_null (loglev);
+  GNUNET_free (logfile);
+  GNUNET_free (loglev);
   GNUNET_free (cfg_filename);
-  GNUNET_free_non_null (opt_cfg_filename);
+  GNUNET_free (opt_cfg_filename);
 
   return err ? GNUNET_SYSERR : sh.ret;
 }
diff --git a/src/util/socks.c b/src/util/socks.c
index 756be753a..7ab297272 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -665,7 +665,7 @@ GNUNET_SOCKS_do_connect (const char *service_name,
                                                   (host0 != NULL) ? host0
                                                   : "127.0.0.1",
                                                   port0);
-  GNUNET_free_non_null (host0);
+  GNUNET_free (host0);
 
   /* Sets to NULL if they do not exist */
   (void) GNUNET_CONFIGURATION_get_value_string (cfg,
@@ -677,8 +677,8 @@ GNUNET_SOCKS_do_connect (const char *service_name,
                                                 "SOCKSPASS",
                                                 &pass);
   ih = GNUNET_SOCKS_init_handshake (user, pass);
-  GNUNET_free_non_null (user);
-  GNUNET_free_non_null (pass);
+  GNUNET_free (user);
+  GNUNET_free (pass);
 
   GNUNET_SOCKS_set_handshake_destination (ih, host1, port1);
   GNUNET_free (host1);
diff --git a/src/util/strings.c b/src/util/strings.c
index 9510b3b3b..5148d0368 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -1148,7 +1148,7 @@ GNUNET_STRINGS_path_is_absolute (const char *filename,
       if (r_uri_scheme)
         *r_uri_scheme = uri;
       else
-        GNUNET_free_non_null (uri);
+        GNUNET_free (uri);
 
       return GNUNET_STRINGS_path_is_absolute (post_scheme_path,
                                               GNUNET_NO,
diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c
index a24af7124..da3d2f470 100644
--- a/src/util/test_common_allocation.c
+++ b/src/util/test_common_allocation.c
@@ -55,9 +55,9 @@ check (void)
     GNUNET_free (ptrs[i]);
   }
 
-  /* GNUNET_free_non_null test */
-  GNUNET_free_non_null (NULL);
-  GNUNET_free_non_null (GNUNET_malloc (4));
+  /* GNUNET_free test */
+  GNUNET_free (NULL);
+  GNUNET_free (GNUNET_malloc (4));
 
   /* GNUNET_strdup tests */
   ptrs[0] = GNUNET_strdup ("bar");
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 6227a28db..59b1b2291 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -128,7 +128,7 @@ diffsCallBack (void *cls, const char *section, const char *option,
       }
       else
         cbData->status = 1;
-      GNUNET_free_non_null (diffValue);
+      GNUNET_free (diffValue);
       break;
     }
 
diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index d768f3699..db413f313 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -113,7 +113,7 @@ testMeta (int i)
       GNUNET_CONTAINER_meta_data_serialize (m, &sval, size,
                                             GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL))
   {
-    GNUNET_free_non_null (sval);
+    GNUNET_free (sval);
     ABORT (m);
   }
   GNUNET_CONTAINER_meta_data_destroy (m);
diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c
index 9f6cd5ed0..5012c7f5b 100644
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -147,7 +147,7 @@ verifyCrypto ()
     ret = 1;
   }
 error:
-  GNUNET_free_non_null (res);
+  GNUNET_free (res);
   return ret;
 }
 
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 13fda53bf..05716741e 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -215,7 +215,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   own_fqdn = GNUNET_RESOLVER_local_fqdn_get ();
   /* can't really check, only thing we can safely
      compare against is our own identical logic... */
-  GNUNET_free_non_null (own_fqdn);
+  GNUNET_free (own_fqdn);
 
   /*
    * Testing non-local DNS resolution