GNUNET_free_non_null -> GNUNET_free

4 files changed, 19 insertions, 19 deletions

diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
index 6a014357e..25b963532 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -1307,17 +1307,17 @@ free_experiment (struct Experiment *e)
     for (cur_o = next_o; NULL != cur_o; cur_o = next_o)
     {
       next_o = cur_o->next;
-      GNUNET_free_non_null (cur_o->address);
-      GNUNET_free_non_null (cur_o->plugin);
+      GNUNET_free (cur_o->address);
+      GNUNET_free (cur_o->plugin);
       GNUNET_free (cur_o);
     }
     GNUNET_free (cur);
   }
 
-  GNUNET_free_non_null (e->name);
-  GNUNET_free_non_null (e->log_prefix);
-  GNUNET_free_non_null (e->log_output_dir);
-  GNUNET_free_non_null (e->cfg_file);
+  GNUNET_free (e->name);
+  GNUNET_free (e->log_prefix);
+  GNUNET_free (e->log_output_dir);
+  GNUNET_free (e->cfg_file);
   GNUNET_free (e);
 }
 
@@ -1967,7 +1967,7 @@ load_op_start_set_property (struct GNUNET_ATS_TEST_Operation *o,
     fprintf (stderr, "Missing property in operation %u `%s' in episode %u\n",
              op_counter, op_name, e->id);
     GNUNET_free (op_name);
-    GNUNET_free_non_null (prop);
+    GNUNET_free (prop);
     return GNUNET_SYSERR;
   }
 
@@ -2038,7 +2038,7 @@ load_op_stop_set_property (struct GNUNET_ATS_TEST_Operation *o,
     fprintf (stderr, "Missing property in operation %u `%s' in episode `%s'\n",
              op_counter, "STOP_SET_PROPERTY", op_name);
     GNUNET_free (op_name);
-    GNUNET_free_non_null (pref);
+    GNUNET_free (pref);
     return GNUNET_SYSERR;
   }
 
@@ -2047,7 +2047,7 @@ load_op_stop_set_property (struct GNUNET_ATS_TEST_Operation *o,
     fprintf (stderr, "Invalid property in operation %u `%s' in episode %u\n",
              op_counter, op_name, e->id);
     GNUNET_free (op_name);
-    GNUNET_free_non_null (pref);
+    GNUNET_free (pref);
     return GNUNET_SYSERR;
   }
 
@@ -2419,7 +2419,7 @@ enforce_del_address (struct GNUNET_ATS_TEST_Operation *op)
   }
   GNUNET_CONTAINER_DLL_remove (p->addr_head, p->addr_tail, a);
 
-  GNUNET_free_non_null (a->ats_addr->atsi);
+  GNUNET_free (a->ats_addr->atsi);
   GNUNET_free (a->ats_addr);
   GNUNET_free (a);
 }
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 8e20f4454..2fbadef4d 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -325,8 +325,8 @@ end_now (int res)
     ph.stat = NULL;
   }
 
-  GNUNET_free_non_null (ph.peers);
-  GNUNET_free_non_null (ph.iterations_results);
+  GNUNET_free (ph.peers);
+  GNUNET_free (ph.iterations_results);
 
   GAS_normalization_stop ();
   GAS_preference_done ();
@@ -1090,13 +1090,13 @@ write_all_iterations (void)
   if ((NULL != f_full) && (GNUNET_SYSERR == GNUNET_DISK_file_close (f_full)))
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot close log file `%s'\n",
                 data_fn_full);
-  GNUNET_free_non_null (data_fn_full);
+  GNUNET_free (data_fn_full);
 
   if ((NULL != f_update) && (GNUNET_SYSERR == GNUNET_DISK_file_close (
                                f_update)))
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot close log file `%s'\n",
                 data_fn_update);
-  GNUNET_free_non_null (data_fn_update);
+  GNUNET_free (data_fn_update);
 }
 
 
@@ -1115,7 +1115,7 @@ do_delete_address (void *cls,
                                                        pid,
                                                        cur));
   ph.sf->s_del (ph.sf->cls, cur);
-  GNUNET_free_non_null (cur->atsi);
+  GNUNET_free (cur->atsi);
   GNUNET_free (cur);
   return GNUNET_OK;
 }
@@ -1427,7 +1427,7 @@ run (void *cls, char *const *args, const char *cfgfile,
       if (0 == c2)
         continue;
       if (ph.measure_updates)
-        GNUNET_free_non_null (
+        GNUNET_free (
           ph.iterations_results[c].update_results_array[c2]);
       GNUNET_free (ph.iterations_results[c].results_array[c2]);
     }
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index f4324d238..f554291b6 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -1225,7 +1225,7 @@ libgnunet_plugin_ats_proportional_done (void *cls)
       GNUNET_CONTAINER_DLL_remove (s->network_entries[c].head,
                                    s->network_entries[c].tail,
                                    cur);
-      GNUNET_free_non_null (cur->addr->solver_information);
+      GNUNET_free (cur->addr->solver_information);
       GNUNET_free (cur);
     }
     GNUNET_free (s->network_entries[c].stat_total);
diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c
index 2c4d3f5ad..d19da0106 100644
--- a/src/ats/test_ats_lib.c
+++ b/src/ats/test_ats_lib.c
@@ -165,7 +165,7 @@ free_asd (void *cls,
                  GNUNET_CONTAINER_multipeermap_remove (p2asd,
                                                        key,
                                                        asd));
-  GNUNET_free_non_null (asd->address);
+  GNUNET_free (asd->address);
   GNUNET_free (asd);
   return GNUNET_OK;
 }
@@ -951,7 +951,7 @@ address_suggest_cb (void *cls,
   asd->bandwidth_out = bandwidth_out;
   asd->bandwidth_in = bandwidth_in;
   asd->session = session;
-  GNUNET_free_non_null (asd->address);
+  GNUNET_free (asd->address);
   asd->address = NULL;
   if (NULL != address)
     asd->address = GNUNET_HELLO_address_copy (address);