GNUNET_free_non_null -> GNUNET_free

4 files changed, 9 insertions, 9 deletions

diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 3fc46e19c..1c9e5e463 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -1355,7 +1355,7 @@ cleaning_task (void *cls)
     GNUNET_SCHEDULER_cancel (stat_timeout_task);
     stat_timeout_task = NULL;
   }
-  GNUNET_free_non_null (plugin_name);
+  GNUNET_free (plugin_name);
   plugin_name = NULL;
   if (last_sync > 0)
     sync_stats ();
@@ -1490,7 +1490,7 @@ run (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _ ("Could not use specified filename `%s' for bloomfilter.\n"),
                 NULL != fn ? fn : "");
-    GNUNET_free_non_null (fn);
+    GNUNET_free (fn);
     fn = NULL;
   }
   if (NULL != fn)
@@ -1566,7 +1566,7 @@ run (void *cls,
                                          5);  /* approx. 3% false positives at max use */
     refresh_bf = GNUNET_YES;
   }
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
   if (NULL == filter)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index b3b30f256..cecc37978 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -550,7 +550,7 @@ database_shutdown (struct Plugin *plugin)
 #endif
   if (SQLITE_OK != result)
     LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_close");
-  GNUNET_free_non_null (plugin->fn);
+  GNUNET_free (plugin->fn);
 }
 
 
@@ -640,7 +640,7 @@ sqlite_plugin_put (void *cls,
                       GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                       "sqlite3_step");
       cont (cont_cls, key, size, GNUNET_SYSERR, msg);
-      GNUNET_free_non_null (msg);
+      GNUNET_free (msg);
       return;
     }
     int changes = sqlite3_changes (plugin->dbh);
@@ -724,12 +724,12 @@ sqlite_plugin_put (void *cls,
     database_shutdown (plugin);
     database_setup (plugin->env->cfg, plugin);
     cont (cont_cls, key, size, GNUNET_SYSERR, msg);
-    GNUNET_free_non_null (msg);
+    GNUNET_free (msg);
     return;
   }
   GNUNET_SQ_reset (plugin->dbh, stmt);
   cont (cont_cls, key, size, ret, msg);
-  GNUNET_free_non_null (msg);
+  GNUNET_free (msg);
 }
 
 
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index dbe590bab..e72a6acd3 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -198,7 +198,7 @@ check_success (void *cls,
                 msg);
     crc->phase = RP_ERROR;
   }
-  GNUNET_free_non_null (crc->data);
+  GNUNET_free (crc->data);
   crc->data = NULL;
   GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 7bec0d064..175765267 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -131,7 +131,7 @@ check_success (void *cls, int success, struct GNUNET_TIME_Absolute
   if (GNUNET_OK != success)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", msg);
   GNUNET_assert (GNUNET_OK == success);
-  GNUNET_free_non_null (crc->data);
+  GNUNET_free (crc->data);
   crc->data = NULL;
   GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }