20 files changed, 112 insertions, 112 deletions

diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 3d2ba3e99..920786146 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -570,7 +570,7 @@ GNUNET_FS_data_reader_copy_ (void *cls,
     return 0;
   if (0 == max)
   {
-    GNUNET_free_non_null (data);
+    GNUNET_free (data);
     return 0;
   }
   GNUNET_memcpy (buf, &data[offset], max);
@@ -1132,15 +1132,15 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h,
     GNUNET_free (filename);
     filename = NULL;
   }
-  GNUNET_free_non_null (ksks);
-  GNUNET_free_non_null (skss);
-  GNUNET_free_non_null (chks);
+  GNUNET_free (ksks);
+  GNUNET_free (skss);
+  GNUNET_free (chks);
   return ret;
 cleanup:
-  GNUNET_free_non_null (ksks);
-  GNUNET_free_non_null (chks);
-  GNUNET_free_non_null (skss);
-  GNUNET_free_non_null (filename);
+  GNUNET_free (ksks);
+  GNUNET_free (chks);
+  GNUNET_free (skss);
+  GNUNET_free (filename);
   GNUNET_FS_file_information_destroy (ret, NULL, NULL);
   return NULL;
 }
@@ -1417,11 +1417,11 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi)
     GNUNET_break (0);
     goto cleanup;
   }
-  GNUNET_free_non_null (chks);
+  GNUNET_free (chks);
   chks = NULL;
-  GNUNET_free_non_null (ksks);
+  GNUNET_free (ksks);
   ksks = NULL;
-  GNUNET_free_non_null (skss);
+  GNUNET_free (skss);
   skss = NULL;
 
   switch (b)
@@ -1527,9 +1527,9 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi)
 cleanup:
   if (NULL != wh)
     (void) GNUNET_BIO_write_close (wh, NULL);
-  GNUNET_free_non_null (chks);
-  GNUNET_free_non_null (ksks);
-  GNUNET_free_non_null (skss);
+  GNUNET_free (chks);
+  GNUNET_free (ksks);
+  GNUNET_free (skss);
   fn = get_serialization_file_name (fi->h,
                                     GNUNET_FS_SYNC_PATH_FILE_INFO,
                                     fi->serialization);
@@ -1729,10 +1729,10 @@ deserialize_publish_file (void *cls, const char *filename)
   pc->top = GNUNET_FS_make_top (h, &GNUNET_FS_publish_signal_suspend_, pc);
   return GNUNET_OK;
 cleanup:
-  GNUNET_free_non_null (pc->nid);
-  GNUNET_free_non_null (pc->nuid);
-  GNUNET_free_non_null (fi_root);
-  GNUNET_free_non_null (fi_pos);
+  GNUNET_free (pc->nid);
+  GNUNET_free (pc->nuid);
+  GNUNET_free (fi_root);
+  GNUNET_free (fi_pos);
   if ((NULL != rh) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -2131,7 +2131,7 @@ GNUNET_FS_download_sync_ (struct GNUNET_FS_DownloadContext *dc)
       goto cleanup;
     }
   }
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   uris = NULL;
   if (GNUNET_OK != GNUNET_BIO_write_close (wh, NULL))
   {
@@ -2144,7 +2144,7 @@ GNUNET_FS_download_sync_ (struct GNUNET_FS_DownloadContext *dc)
 cleanup:
   if (NULL != wh)
     (void) GNUNET_BIO_write_close (wh, NULL);
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   if (0 != unlink (fn))
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
   GNUNET_free (fn);
@@ -2235,10 +2235,10 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr)
     GNUNET_break (0);
     goto cleanup;
   }
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   return;
 cleanup:
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   if (NULL != wh)
     (void) GNUNET_BIO_write_close (wh, NULL);
   remove_sync_file_in_dir (sr->h,
@@ -2309,7 +2309,7 @@ GNUNET_FS_search_sync_ (struct GNUNET_FS_SearchContext *sc)
 cleanup:
   if (NULL != wh)
     (void) GNUNET_BIO_write_close (wh, NULL);
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   GNUNET_FS_remove_sync_file_ (sc->h, category, sc->serialization);
   GNUNET_free (sc->serialization);
   sc->serialization = NULL;
@@ -2359,7 +2359,7 @@ deserialize_unindex_file (void *cls, const char *filename)
       (GNUNET_OK != GNUNET_BIO_read_int32 (rh, "ksk offset",
                                            (int32_t *) &uc->ksk_offset)))
   {
-    GNUNET_free_non_null (uris);
+    GNUNET_free (uris);
     GNUNET_break (0);
     goto cleanup;
   }
@@ -2370,7 +2370,7 @@ deserialize_unindex_file (void *cls, const char *filename)
     if (NULL == uc->ksk_uri)
     {
       GNUNET_break (0);
-      GNUNET_free_non_null (emsg);
+      GNUNET_free (emsg);
       goto cleanup;
     }
   }
@@ -2472,7 +2472,7 @@ deserialize_unindex_file (void *cls, const char *filename)
   }
   return GNUNET_OK;
 cleanup:
-  GNUNET_free_non_null (uc->filename);
+  GNUNET_free (uc->filename);
   if ((NULL != rh) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -2485,7 +2485,7 @@ cleanup:
     GNUNET_FS_remove_sync_file_ (h,
                                  GNUNET_FS_SYNC_PATH_MASTER_UNINDEX,
                                  uc->serialization);
-  GNUNET_free_non_null (uc->serialization);
+  GNUNET_free (uc->serialization);
   GNUNET_free (uc);
   return GNUNET_OK;
 }
@@ -2665,10 +2665,10 @@ deserialize_search_result (void *cls, const char *filename)
   }
   return GNUNET_OK;
 cleanup:
-  GNUNET_free_non_null (download);
-  GNUNET_free_non_null (emsg);
-  GNUNET_free_non_null (uris);
-  GNUNET_free_non_null (update_srch);
+  GNUNET_free (download);
+  GNUNET_free (emsg);
+  GNUNET_free (uris);
+  GNUNET_free (update_srch);
   if (NULL != sr->uri)
     GNUNET_FS_uri_destroy (sr->uri);
   if (NULL != sr->meta)
@@ -2823,8 +2823,8 @@ free_search_context (struct GNUNET_FS_SearchContext *sc)
                                 : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
                                 sc->serialization);
   }
-  GNUNET_free_non_null (sc->serialization);
-  GNUNET_free_non_null (sc->emsg);
+  GNUNET_free (sc->serialization);
+  GNUNET_free (sc->emsg);
   if (NULL != sc->uri)
     GNUNET_FS_uri_destroy (sc->uri);
   if (NULL != sc->master_result_map)
@@ -2896,10 +2896,10 @@ free_download_context (struct GNUNET_FS_DownloadContext *dc)
     GNUNET_CONTAINER_meta_data_destroy (dc->meta);
   if (NULL != dc->uri)
     GNUNET_FS_uri_destroy (dc->uri);
-  GNUNET_free_non_null (dc->temp_filename);
-  GNUNET_free_non_null (dc->emsg);
-  GNUNET_free_non_null (dc->filename);
-  GNUNET_free_non_null (dc->serialization);
+  GNUNET_free (dc->temp_filename);
+  GNUNET_free (dc->emsg);
+  GNUNET_free (dc->filename);
+  GNUNET_free (dc->serialization);
   while (NULL != (dcc = dc->child_head))
   {
     GNUNET_CONTAINER_DLL_remove (dc->child_head, dc->child_tail, dcc);
@@ -3020,8 +3020,8 @@ deserialize_download (struct GNUNET_FS_Handle *h,
   dc->task = GNUNET_SCHEDULER_add_now (&GNUNET_FS_download_start_task_, dc);
   return;
 cleanup:
-  GNUNET_free_non_null (uris);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (uris);
+  GNUNET_free (emsg);
   free_download_context (dc);
 }
 
@@ -3127,9 +3127,9 @@ deserialize_search (struct GNUNET_FS_Handle *h,
   GNUNET_free (uris);
   return sc;
 cleanup:
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   free_search_context (sc);
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   return NULL;
 }
 
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 1ef5fa3bb..9a198d8d7 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -309,8 +309,8 @@ GNUNET_FS_directory_list_contents (size_t size,
            full_data.size,
            full_data.data);
     }
-    GNUNET_free_non_null (full_data.data);
-    GNUNET_free_non_null (filename);
+    GNUNET_free (full_data.data);
+    GNUNET_free (filename);
     GNUNET_CONTAINER_meta_data_destroy (md);
     GNUNET_FS_uri_destroy (uri);
   }
@@ -630,9 +630,9 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
                          "malloc");
     *rsize = 0;
     *rdata = NULL;
-    GNUNET_free_non_null (sizes);
-    GNUNET_free_non_null (perm);
-    GNUNET_free_non_null (bes);
+    GNUNET_free (sizes);
+    GNUNET_free (perm);
+    GNUNET_free (bes);
     return GNUNET_SYSERR;
   }
   *rdata = data;
@@ -662,9 +662,9 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
     GNUNET_memcpy (&data[off - sizes[i]], &(bes[i])[1], sizes[i]);
     GNUNET_free (bes[i]);
   }
-  GNUNET_free_non_null (sizes);
-  GNUNET_free_non_null (perm);
-  GNUNET_free_non_null (bes);
+  GNUNET_free (sizes);
+  GNUNET_free (perm);
+  GNUNET_free (bes);
   GNUNET_assert (off == size);
   GNUNET_CONTAINER_meta_data_destroy (bld->meta);
   GNUNET_free (bld);
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index 11efa053b..cb50182f9 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -106,7 +106,7 @@ GNUNET_FS_directory_scan_abort (struct GNUNET_FS_DirScanner *ds)
     GNUNET_FS_share_tree_free (ds->toplevel);
   if (NULL != ds->stop_task)
     GNUNET_SCHEDULER_cancel (ds->stop_task);
-  GNUNET_free_non_null (ds->ex_arg);
+  GNUNET_free (ds->ex_arg);
   GNUNET_free (ds->filename_expanded);
   GNUNET_free (ds);
 }
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 4d03b6546..6154e8be0 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -960,7 +960,7 @@ trigger_recursive_download (void *cls,
                   "Failed to create directory for recursive download of `%s'\n"),
                 full_name);
     GNUNET_free (full_name);
-    GNUNET_free_non_null (fn);
+    GNUNET_free (fn);
     return;
   }
 
@@ -981,9 +981,9 @@ trigger_recursive_download (void *cls,
                             dc->options,
                             NULL,
                             dc);
-  GNUNET_free_non_null (full_name);
-  GNUNET_free_non_null (temp_name);
-  GNUNET_free_non_null (fn);
+  GNUNET_free (full_name);
+  GNUNET_free (temp_name);
+  GNUNET_free (fn);
 }
 
 
@@ -999,7 +999,7 @@ GNUNET_FS_free_download_request_ (struct DownloadRequest *dr)
     return;
   for (unsigned int i = 0; i < dr->num_children; i++)
     GNUNET_FS_free_download_request_ (dr->children[i]);
-  GNUNET_free_non_null (dr->children);
+  GNUNET_free (dr->children);
   GNUNET_free (dr);
 }
 
@@ -2011,11 +2011,11 @@ GNUNET_FS_download_signal_suspend_ (void *cls)
     GNUNET_CONTAINER_multihashmap_destroy (dc->active);
     dc->active = NULL;
   }
-  GNUNET_free_non_null (dc->filename);
+  GNUNET_free (dc->filename);
   GNUNET_CONTAINER_meta_data_destroy (dc->meta);
   GNUNET_FS_uri_destroy (dc->uri);
-  GNUNET_free_non_null (dc->temp_filename);
-  GNUNET_free_non_null (dc->serialization);
+  GNUNET_free (dc->temp_filename);
+  GNUNET_free (dc->serialization);
   GNUNET_assert (NULL == dc->job_queue);
   GNUNET_free (dc);
 }
@@ -2409,7 +2409,7 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete)
                                 dc->temp_filename);
     GNUNET_free (dc->temp_filename);
   }
-  GNUNET_free_non_null (dc->serialization);
+  GNUNET_free (dc->serialization);
   GNUNET_assert (NULL == dc->job_queue);
   GNUNET_free (dc);
 }
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index 28bbf12dd..3324abd58 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -75,7 +75,7 @@ void
 GNUNET_FS_file_information_set_filename (struct GNUNET_FS_FileInformation *s,
                                          const char *filename)
 {
-  GNUNET_free_non_null (s->filename);
+  GNUNET_free (s->filename);
   if (filename)
     s->filename = GNUNET_strdup (filename);
   else
@@ -426,7 +426,7 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
                &fi->bo,
                &no,
                &fi->client_info);
-    GNUNET_free_non_null (fi->data.dir.dir_data);
+    GNUNET_free (fi->data.dir.dir_data);
   }
   else
   {
@@ -447,8 +447,8 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
                &fi->data.file.do_index,
                &fi->client_info);
   }
-  GNUNET_free_non_null (fi->filename);
-  GNUNET_free_non_null (fi->emsg);
+  GNUNET_free (fi->filename);
+  GNUNET_free (fi->emsg);
   if (NULL != fi->sks_uri)
     GNUNET_FS_uri_destroy (fi->sks_uri);
   if (NULL != fi->chk_uri)
@@ -462,7 +462,7 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
     GNUNET_FS_uri_destroy (fi->keywords);
   if (NULL != fi->meta)
     GNUNET_CONTAINER_meta_data_destroy (fi->meta);
-  GNUNET_free_non_null (fi->serialization);
+  GNUNET_free (fi->serialization);
   if (NULL != fi->te)
   {
     GNUNET_FS_tree_encoder_finish (fi->te, NULL);
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index f098032d7..508f9cadc 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -301,8 +301,8 @@ read_update_information_graph (struct GNUNET_FS_Handle *h,
     if (GNUNET_OK != GNUNET_BIO_read_spec_commit (rh, rs))
     {
       GNUNET_break (0);
-      GNUNET_free_non_null (n->id);
-      GNUNET_free_non_null (n->update);
+      GNUNET_free (n->id);
+      GNUNET_free (n->update);
       if (n->md != NULL)
         GNUNET_CONTAINER_meta_data_destroy (n->md);
       GNUNET_free (n);
@@ -315,7 +315,7 @@ read_update_information_graph (struct GNUNET_FS_Handle *h,
       GNUNET_break (0);
       GNUNET_free (emsg);
       GNUNET_free (n->id);
-      GNUNET_free_non_null (n->update);
+      GNUNET_free (n->update);
       GNUNET_CONTAINER_meta_data_destroy (n->md);
       GNUNET_free (n);
       break;
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 8bb57b1e2..fddc65d67 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -85,9 +85,9 @@ publish_cleanup (struct GNUNET_FS_PublishContext *pc)
     pc->fhc = NULL;
   }
   GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL);
-  GNUNET_free_non_null (pc->nid);
-  GNUNET_free_non_null (pc->nuid);
-  GNUNET_free_non_null (pc->serialization);
+  GNUNET_free (pc->nid);
+  GNUNET_free (pc->nuid);
+  GNUNET_free (pc->serialization);
   if (NULL != pc->dsh)
   {
     GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO);
@@ -650,7 +650,7 @@ publish_content (struct GNUNET_FS_PublishContext *pc)
                                           dirpos->data.file.file_size, raw_data,
                                           &emsg))
             {
-              GNUNET_free_non_null (emsg);
+              GNUNET_free (emsg);
               GNUNET_free (raw_data);
               raw_data = NULL;
             }
@@ -660,10 +660,10 @@ publish_content (struct GNUNET_FS_PublishContext *pc)
         }
         GNUNET_FS_directory_builder_add (db, dirpos->chk_uri, dirpos->meta,
                                          raw_data);
-        GNUNET_free_non_null (raw_data);
+        GNUNET_free (raw_data);
         dirpos = dirpos->next;
       }
-      GNUNET_free_non_null (p->data.dir.dir_data);
+      GNUNET_free (p->data.dir.dir_data);
       p->data.dir.dir_data = NULL;
       p->data.dir.dir_size = 0;
       GNUNET_FS_directory_builder_finish (db, &p->data.dir.dir_size,
@@ -1281,7 +1281,7 @@ suspend_operation (struct GNUNET_FS_FileInformation *fi,
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Suspending publish operation\n");
-  GNUNET_free_non_null (fi->serialization);
+  GNUNET_free (fi->serialization);
   fi->serialization = NULL;
   off = (NULL == fi->chk_uri) ? 0 : (GNUNET_YES == fi->is_directory) ?
         fi->data.dir.dir_size : fi->data.file.file_size;
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 8e2d7deba..3dbee43ef 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -830,7 +830,7 @@ process_kblock (struct GNUNET_FS_SearchContext *sc,
                   &pt[1],
                   emsg);
     }
-    GNUNET_free_non_null (emsg);
+    GNUNET_free (emsg);
     return;
   }
   j = eos - pt + 1;
@@ -900,7 +900,7 @@ process_sblock (struct GNUNET_FS_SearchContext *sc,
                 _ ("Failed to parse URI `%s': %s\n"),
                 uris, emsg);
     GNUNET_break_op (0);        /* ublock malformed */
-    GNUNET_free_non_null (emsg);
+    GNUNET_free (emsg);
     GNUNET_CONTAINER_meta_data_destroy (meta);
     return;
   }
@@ -1548,10 +1548,10 @@ search_result_suspend (void *cls,
     sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
   }
   GNUNET_break (NULL == sr->client_info);
-  GNUNET_free_non_null (sr->serialization);
+  GNUNET_free (sr->serialization);
   GNUNET_FS_uri_destroy (sr->uri);
   GNUNET_CONTAINER_meta_data_destroy (sr->meta);
-  GNUNET_free_non_null (sr->keyword_bitmap);
+  GNUNET_free (sr->keyword_bitmap);
   GNUNET_free (sr);
   return GNUNET_OK;
 }
@@ -1596,10 +1596,10 @@ GNUNET_FS_search_signal_suspend_ (void *cls)
       GNUNET_free (sc->requests[i].keyword);
     }
   }
-  GNUNET_free_non_null (sc->requests);
-  GNUNET_free_non_null (sc->emsg);
+  GNUNET_free (sc->requests);
+  GNUNET_free (sc->emsg);
   GNUNET_FS_uri_destroy (sc->uri);
-  GNUNET_free_non_null (sc->serialization);
+  GNUNET_free (sc->serialization);
   GNUNET_free (sc);
 }
 
@@ -1760,10 +1760,10 @@ search_result_free (void *cls,
   GNUNET_break (NULL == sr->probe_ctx);
   GNUNET_break (NULL == sr->probe_cancel_task);
   GNUNET_break (NULL == sr->client_info);
-  GNUNET_free_non_null (sr->serialization);
+  GNUNET_free (sr->serialization);
   GNUNET_FS_uri_destroy (sr->uri);
   GNUNET_CONTAINER_meta_data_destroy (sr->meta);
-  GNUNET_free_non_null (sr->keyword_bitmap);
+  GNUNET_free (sr->keyword_bitmap);
   GNUNET_free (sr);
   return GNUNET_OK;
 }
@@ -1825,8 +1825,8 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc)
     for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)
       GNUNET_CONTAINER_multihashmap_destroy (sc->requests[i].results);
   }
-  GNUNET_free_non_null (sc->requests);
-  GNUNET_free_non_null (sc->emsg);
+  GNUNET_free (sc->requests);
+  GNUNET_free (sc->emsg);
   GNUNET_FS_uri_destroy (sc->uri);
   GNUNET_free (sc);
 }
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c
index e291938b5..ac850076d 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -447,8 +447,8 @@ GNUNET_FS_share_tree_free (struct GNUNET_FS_ShareTreeItem *toplevel)
     GNUNET_CONTAINER_meta_data_destroy (toplevel->meta);
   if (NULL != toplevel->ksk_uri)
     GNUNET_FS_uri_destroy (toplevel->ksk_uri);
-  GNUNET_free_non_null (toplevel->filename);
-  GNUNET_free_non_null (toplevel->short_filename);
+  GNUNET_free (toplevel->filename);
+  GNUNET_free (toplevel->short_filename);
   GNUNET_free (toplevel);
 }
 
diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
index a0fe336df..dc4b214d9 100644
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -195,7 +195,7 @@ report_uri (void *cls)
   if ((GNUNET_YES != po->do_index) &&
       (NULL != po->publish_tmp_file))
     (void) GNUNET_DISK_directory_remove (po->publish_tmp_file);
-  GNUNET_free_non_null (po->publish_tmp_file);
+  GNUNET_free (po->publish_tmp_file);
   GNUNET_free (po);
 }
 
@@ -217,7 +217,7 @@ publish_timeout (void *cls)
   GNUNET_FS_publish_stop (po->publish_context);
   po->publish_cont (po->publish_cont_cls, NULL, NULL);
   (void) GNUNET_DISK_directory_remove (po->publish_tmp_file);
-  GNUNET_free_non_null (po->publish_tmp_file);
+  GNUNET_free (po->publish_tmp_file);
   GNUNET_free (po);
 }
 
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c
index e7f922823..6203690d2 100644
--- a/src/fs/fs_tree.c
+++ b/src/fs/fs_tree.c
@@ -454,7 +454,7 @@ GNUNET_FS_tree_encoder_finish (struct GNUNET_FS_TreeEncoder *te,
   if (emsg != NULL)
     *emsg = te->emsg;
   else
-    GNUNET_free_non_null (te->emsg);
+    GNUNET_free (te->emsg);
   GNUNET_free (te->chk_tree);
   GNUNET_free (te);
 }
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index f2315d7d0..8c27af9de 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -415,7 +415,7 @@ GNUNET_FS_unindex_do_extract_keywords_ (struct GNUNET_FS_UnindexContext *uc)
                                               GNUNET_NO, ex,
                                               &unindex_directory_scan_cb,
                                               uc);
-  GNUNET_free_non_null (ex);
+  GNUNET_free (ex);
 }
 
 
@@ -777,8 +777,8 @@ GNUNET_FS_unindex_signal_suspend_ (void *cls)
                                    UNINDEX_STATE_COMPLETE) ? uc->file_size : 0);
   GNUNET_break (NULL == uc->client_info);
   GNUNET_free (uc->filename);
-  GNUNET_free_non_null (uc->serialization);
-  GNUNET_free_non_null (uc->emsg);
+  GNUNET_free (uc->serialization);
+  GNUNET_free (uc->emsg);
   GNUNET_free (uc);
 }
 
@@ -892,7 +892,7 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc)
                                   (uc->state ==
                                    UNINDEX_STATE_COMPLETE) ? uc->file_size : 0);
   GNUNET_break (NULL == uc->client_info);
-  GNUNET_free_non_null (uc->emsg);
+  GNUNET_free (uc->emsg);
   GNUNET_free (uc->filename);
   GNUNET_free (uc);
 }
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 410f3c815..9c430ad9d 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -353,7 +353,7 @@ uri_ksk_parse (const char *s, char **emsg)
   return ret;
 CLEANUP:
   for (i = 0; i < max; i++)
-    GNUNET_free_non_null (keywords[i]);
+    GNUNET_free (keywords[i]);
   GNUNET_free (keywords);
   GNUNET_free (dup);
   return NULL;
@@ -1172,7 +1172,7 @@ GNUNET_FS_uri_ksk_create_from_args (unsigned int argc, const char **argv)
                      strlen (GNUNET_FS_URI_PREFIX))) &&
       (NULL != (uri = GNUNET_FS_uri_parse (argv[0], &emsg))))
     return uri;
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   uri = GNUNET_new (struct GNUNET_FS_Uri);
   uri->type = GNUNET_FS_URI_KSK;
   uri->data.ksk.keywordCount = argc;
@@ -1825,7 +1825,7 @@ GNUNET_FS_uri_ksk_create_from_meta_data (
                                 ret->data.ksk.keywords,
                                 ret->data.ksk.keywordCount);
   if (ent > 0)
-    GNUNET_free_non_null (full_name);
+    GNUNET_free (full_name);
   return ret;
 }
 
diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c
index 3aed0268b..ee4a719e0 100644
--- a/src/fs/gnunet-auto-share.c
+++ b/src/fs/gnunet-auto-share.c
@@ -227,13 +227,13 @@ load_state ()
     return;
   rh = NULL;
 error:
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
   if (NULL != rh)
     (void) GNUNET_BIO_read_close (rh, &emsg);
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               _ ("Failed to load state: %s\n"),
               emsg);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
 }
 
 
@@ -781,7 +781,7 @@ main (int argc, char *const *argv)
   shc_chld = NULL;
   GNUNET_DISK_pipe_close (sigpipe);
   sigpipe = NULL;
-  GNUNET_free_non_null (cfg_filename);
+  GNUNET_free (cfg_filename);
   cfg_filename = NULL;
   GNUNET_free_nz ((void *) argv);
   return ok;
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index 10a09f73b..ef5c40ae2 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -106,7 +106,7 @@ print_entry (void *cls,
     GNUNET_CONTAINER_meta_data_iterate (meta, &item_printer, NULL);
     printf ("\n");
     printf (_ ("Directory `%s' contents:\n"), name ? name : "");
-    GNUNET_free_non_null (name);
+    GNUNET_free (name);
     return;
   }
   string = GNUNET_FS_uri_to_string (uri);
@@ -114,7 +114,7 @@ print_entry (void *cls,
   GNUNET_free (string);
   GNUNET_CONTAINER_meta_data_iterate (meta, &item_printer, NULL);
   printf ("\n");
-  GNUNET_free_non_null (name);
+  GNUNET_free (name);
 }
 
 
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index b10e6163c..91fcd8f8a 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -729,7 +729,7 @@ identity_continuation (const char *args0)
              _ ("Failed to access `%s': %s\n"),
              args0,
              strerror (errno));
-    GNUNET_free_non_null (ex);
+    GNUNET_free (ex);
     return;
   }
   ds = GNUNET_FS_directory_scan_start (args0,
@@ -744,10 +744,10 @@ identity_continuation (const char *args0)
       "%s",
       _ (
         "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs installed?\n"));
-    GNUNET_free_non_null (ex);
+    GNUNET_free (ex);
     return;
   }
-  GNUNET_free_non_null (ex);
+  GNUNET_free (ex);
 }
 
 
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 098633379..d25ae55e6 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -127,7 +127,7 @@ clean_task (void *cls)
              _ ("Failed to write directory with search results to `%s'\n"),
              output_filename);
   }
-  GNUNET_free_non_null (ddata);
+  GNUNET_free (ddata);
   GNUNET_free (output_filename);
 }
 
@@ -197,7 +197,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
                                           NULL);
     printf ("\n");
     fflush (stdout);
-    GNUNET_free_non_null (filename);
+    GNUNET_free (filename);
     GNUNET_free (uri);
     results++;
     if ((results_limit > 0) && (results >= results_limit))
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 71de5668b..150dd72e2 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -588,7 +588,7 @@ GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr)
   if (NULL != pr->public_data.target)
     ext[k++] = *pr->public_data.target;
   GNUNET_memcpy (&ext[k], bf_data, bf_size);
-  GNUNET_free_non_null (bf_data);
+  GNUNET_free (bf_data);
   return env;
 }
 
@@ -622,7 +622,7 @@ clean_request (void *cls, const struct GNUNET_HashCode *key, void *value)
     cont (pr->llc_cont_cls, pr, pr->local_result);
   }
   GSF_plan_notify_request_done_ (pr);
-  GNUNET_free_non_null (pr->replies_seen);
+  GNUNET_free (pr->replies_seen);
   GNUNET_BLOCK_group_destroy (pr->bg);
   pr->bg = NULL;
   GNUNET_PEER_change_rc (pr->sender_pid, -1);
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index 391b667cb..9305471d6 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -129,8 +129,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_FS_file_information_destroy (fidir, &mycleaner, NULL);
   GNUNET_DISK_directory_remove (fn1);
   GNUNET_DISK_directory_remove (fn2);
-  GNUNET_free_non_null (fn1);
-  GNUNET_free_non_null (fn2);
+  GNUNET_free (fn1);
+  GNUNET_free (fn2);
   GNUNET_FS_stop (fs);
 }
 
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 484884243..c1e10d575 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -190,7 +190,7 @@ publish_cont (void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg)
     fprintf (stderr, "failed to parse URI `%s': %s\n", sbuf, msg);
     err = 1;
     GNUNET_FS_stop (fs);
-    GNUNET_free_non_null (msg);
+    GNUNET_free (msg);
     return;
   }
   ksk_search =