GNUNET_free_non_null -> GNUNET_free

4 files changed, 12 insertions, 12 deletions

diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index fa379200f..9f8db1be4 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -88,8 +88,8 @@ free_experiment (struct Experiment *e)
     GNUNET_free (cur);
   }
 
-  GNUNET_free_non_null (e->name);
-  GNUNET_free_non_null (e->cfg_file);
+  GNUNET_free (e->name);
+  GNUNET_free (e->cfg_file);
   GNUNET_free (e);
 }
 
@@ -332,7 +332,7 @@ load_episode (struct Experiment *e,
           GNUNET_free (type);
           GNUNET_free (op_name);
           GNUNET_free (op);
-          GNUNET_free_non_null (pref);
+          GNUNET_free (pref);
           GNUNET_free (o);
           GNUNET_free (sec_name);
           return GNUNET_SYSERR;
@@ -350,7 +350,7 @@ load_episode (struct Experiment *e,
           GNUNET_free (type);
           GNUNET_free (op_name);
           GNUNET_free (op);
-          GNUNET_free_non_null (pref);
+          GNUNET_free (pref);
           GNUNET_free (o);
           GNUNET_free (sec_name);
           return GNUNET_SYSERR;
@@ -384,7 +384,7 @@ load_episode (struct Experiment *e,
       fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n",
                op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id);
 
-    GNUNET_free_non_null (type);
+    GNUNET_free (type);
     GNUNET_free (op);
 
     GNUNET_CONTAINER_DLL_insert (cur->head, cur->tail, o);
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index c7969cdfe..c6ba8533d 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -110,7 +110,7 @@ do_shutdown (void *cls)
       GNUNET_TESTBED_operation_done (p->comm_op);
       p->comm_op = NULL;
     }
-    GNUNET_free_non_null (p->core_connect_ops);
+    GNUNET_free (p->core_connect_ops);
     GNUNET_free (p->partners);
     p->partners = NULL;
   }
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c
index fb3014798..15cd52e2f 100644
--- a/src/ats-tests/gnunet-ats-sim.c
+++ b/src/ats-tests/gnunet-ats-sim.c
@@ -339,7 +339,7 @@ parse_args (int argc, char *argv[])
   {
     if ((c < (argc - 1)) && (0 == strcmp (argv[c], "-e")))
     {
-      GNUNET_free_non_null (opt_exp_file);
+      GNUNET_free (opt_exp_file);
       opt_exp_file = GNUNET_strdup (argv[c + 1]);
     }
     if (0 == strcmp (argv[c], "-l"))
diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c
index 09ddd7b2d..7a3461bf7 100644
--- a/src/ats-tests/gnunet-solver-eval.c
+++ b/src/ats-tests/gnunet-solver-eval.c
@@ -94,8 +94,8 @@ free_experiment (struct Experiment *e)
     GNUNET_free (cur);
   }
 
-  GNUNET_free_non_null (e->name);
-  GNUNET_free_non_null (e->cfg_file);
+  GNUNET_free (e->name);
+  GNUNET_free (e->cfg_file);
   GNUNET_free (e);
 }
 
@@ -344,7 +344,7 @@ load_episode (struct Experiment *e,
           GNUNET_free (op_name);
           GNUNET_free (op);
           GNUNET_free (sec_name);
-          GNUNET_free_non_null (pref);
+          GNUNET_free (pref);
           GNUNET_free (o);
           return GNUNET_SYSERR;
         }
@@ -364,7 +364,7 @@ load_episode (struct Experiment *e,
           GNUNET_free (op_name);
           GNUNET_free (op);
           GNUNET_free (sec_name);
-          GNUNET_free_non_null (pref);
+          GNUNET_free (pref);
           GNUNET_free (o);
           return GNUNET_SYSERR;
         }
@@ -397,7 +397,7 @@ load_episode (struct Experiment *e,
       fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n",
                op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id);
 
-    GNUNET_free_non_null (type);
+    GNUNET_free (type);
     GNUNET_free (op);
 
     GNUNET_CONTAINER_DLL_insert (cur->head, cur->tail, o);