diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:32:34 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:32:34 +0200 |
commit | e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2 (patch) | |
tree | 61df772a93f7f21af7c715ddd4b9a3f1a50e0509 /src/ats-tests | |
parent | 1437556645417e6302862845e7ebcbd4c9908357 (diff) | |
download | gnunet-e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2.tar.gz gnunet-e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2.zip |
GNUNET_free_non_null -> GNUNET_free
Diffstat (limited to 'src/ats-tests')
-rw-r--r-- | src/ats-tests/ats-testing-experiment.c | 10 | ||||
-rw-r--r-- | src/ats-tests/ats-testing.c | 2 | ||||
-rw-r--r-- | src/ats-tests/gnunet-ats-sim.c | 2 | ||||
-rw-r--r-- | src/ats-tests/gnunet-solver-eval.c | 10 |
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) | |||
88 | GNUNET_free (cur); | 88 | GNUNET_free (cur); |
89 | } | 89 | } |
90 | 90 | ||
91 | GNUNET_free_non_null (e->name); | 91 | GNUNET_free (e->name); |
92 | GNUNET_free_non_null (e->cfg_file); | 92 | GNUNET_free (e->cfg_file); |
93 | GNUNET_free (e); | 93 | GNUNET_free (e); |
94 | } | 94 | } |
95 | 95 | ||
@@ -332,7 +332,7 @@ load_episode (struct Experiment *e, | |||
332 | GNUNET_free (type); | 332 | GNUNET_free (type); |
333 | GNUNET_free (op_name); | 333 | GNUNET_free (op_name); |
334 | GNUNET_free (op); | 334 | GNUNET_free (op); |
335 | GNUNET_free_non_null (pref); | 335 | GNUNET_free (pref); |
336 | GNUNET_free (o); | 336 | GNUNET_free (o); |
337 | GNUNET_free (sec_name); | 337 | GNUNET_free (sec_name); |
338 | return GNUNET_SYSERR; | 338 | return GNUNET_SYSERR; |
@@ -350,7 +350,7 @@ load_episode (struct Experiment *e, | |||
350 | GNUNET_free (type); | 350 | GNUNET_free (type); |
351 | GNUNET_free (op_name); | 351 | GNUNET_free (op_name); |
352 | GNUNET_free (op); | 352 | GNUNET_free (op); |
353 | GNUNET_free_non_null (pref); | 353 | GNUNET_free (pref); |
354 | GNUNET_free (o); | 354 | GNUNET_free (o); |
355 | GNUNET_free (sec_name); | 355 | GNUNET_free (sec_name); |
356 | return GNUNET_SYSERR; | 356 | return GNUNET_SYSERR; |
@@ -384,7 +384,7 @@ load_episode (struct Experiment *e, | |||
384 | fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n", | 384 | fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n", |
385 | op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id); | 385 | op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id); |
386 | 386 | ||
387 | GNUNET_free_non_null (type); | 387 | GNUNET_free (type); |
388 | GNUNET_free (op); | 388 | GNUNET_free (op); |
389 | 389 | ||
390 | GNUNET_CONTAINER_DLL_insert (cur->head, cur->tail, o); | 390 | 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) | |||
110 | GNUNET_TESTBED_operation_done (p->comm_op); | 110 | GNUNET_TESTBED_operation_done (p->comm_op); |
111 | p->comm_op = NULL; | 111 | p->comm_op = NULL; |
112 | } | 112 | } |
113 | GNUNET_free_non_null (p->core_connect_ops); | 113 | GNUNET_free (p->core_connect_ops); |
114 | GNUNET_free (p->partners); | 114 | GNUNET_free (p->partners); |
115 | p->partners = NULL; | 115 | p->partners = NULL; |
116 | } | 116 | } |
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[]) | |||
339 | { | 339 | { |
340 | if ((c < (argc - 1)) && (0 == strcmp (argv[c], "-e"))) | 340 | if ((c < (argc - 1)) && (0 == strcmp (argv[c], "-e"))) |
341 | { | 341 | { |
342 | GNUNET_free_non_null (opt_exp_file); | 342 | GNUNET_free (opt_exp_file); |
343 | opt_exp_file = GNUNET_strdup (argv[c + 1]); | 343 | opt_exp_file = GNUNET_strdup (argv[c + 1]); |
344 | } | 344 | } |
345 | if (0 == strcmp (argv[c], "-l")) | 345 | 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) | |||
94 | GNUNET_free (cur); | 94 | GNUNET_free (cur); |
95 | } | 95 | } |
96 | 96 | ||
97 | GNUNET_free_non_null (e->name); | 97 | GNUNET_free (e->name); |
98 | GNUNET_free_non_null (e->cfg_file); | 98 | GNUNET_free (e->cfg_file); |
99 | GNUNET_free (e); | 99 | GNUNET_free (e); |
100 | } | 100 | } |
101 | 101 | ||
@@ -344,7 +344,7 @@ load_episode (struct Experiment *e, | |||
344 | GNUNET_free (op_name); | 344 | GNUNET_free (op_name); |
345 | GNUNET_free (op); | 345 | GNUNET_free (op); |
346 | GNUNET_free (sec_name); | 346 | GNUNET_free (sec_name); |
347 | GNUNET_free_non_null (pref); | 347 | GNUNET_free (pref); |
348 | GNUNET_free (o); | 348 | GNUNET_free (o); |
349 | return GNUNET_SYSERR; | 349 | return GNUNET_SYSERR; |
350 | } | 350 | } |
@@ -364,7 +364,7 @@ load_episode (struct Experiment *e, | |||
364 | GNUNET_free (op_name); | 364 | GNUNET_free (op_name); |
365 | GNUNET_free (op); | 365 | GNUNET_free (op); |
366 | GNUNET_free (sec_name); | 366 | GNUNET_free (sec_name); |
367 | GNUNET_free_non_null (pref); | 367 | GNUNET_free (pref); |
368 | GNUNET_free (o); | 368 | GNUNET_free (o); |
369 | return GNUNET_SYSERR; | 369 | return GNUNET_SYSERR; |
370 | } | 370 | } |
@@ -397,7 +397,7 @@ load_episode (struct Experiment *e, | |||
397 | fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n", | 397 | fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n", |
398 | op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id); | 398 | op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id); |
399 | 399 | ||
400 | GNUNET_free_non_null (type); | 400 | GNUNET_free (type); |
401 | GNUNET_free (op); | 401 | GNUNET_free (op); |
402 | 402 | ||
403 | GNUNET_CONTAINER_DLL_insert (cur->head, cur->tail, o); | 403 | GNUNET_CONTAINER_DLL_insert (cur->head, cur->tail, o); |