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/nat | |
parent | 1437556645417e6302862845e7ebcbd4c9908357 (diff) | |
download | gnunet-e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2.tar.gz gnunet-e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2.zip |
GNUNET_free_non_null -> GNUNET_free
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/gnunet-nat.c | 8 | ||||
-rw-r--r-- | src/nat/gnunet-service-nat.c | 6 | ||||
-rw-r--r-- | src/nat/test_nat.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c index 5012d6455..0743a478d 100644 --- a/src/nat/gnunet-nat.c +++ b/src/nat/gnunet-nat.c | |||
@@ -392,15 +392,15 @@ run (void *cls, | |||
392 | &stun_read_task, | 392 | &stun_read_task, |
393 | NULL); | 393 | NULL); |
394 | } | 394 | } |
395 | GNUNET_free_non_null (remote_sa); | 395 | GNUNET_free (remote_sa); |
396 | GNUNET_free_non_null (local_sa); | 396 | GNUNET_free (local_sa); |
397 | test_finished (); | 397 | test_finished (); |
398 | return; | 398 | return; |
399 | fail_and_shutdown: | 399 | fail_and_shutdown: |
400 | global_ret = 1; | 400 | global_ret = 1; |
401 | GNUNET_SCHEDULER_shutdown (); | 401 | GNUNET_SCHEDULER_shutdown (); |
402 | GNUNET_free_non_null (remote_sa); | 402 | GNUNET_free (remote_sa); |
403 | GNUNET_free_non_null (local_sa); | 403 | GNUNET_free (local_sa); |
404 | } | 404 | } |
405 | 405 | ||
406 | 406 | ||
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c index 3b7d48c82..4dcc0312f 100644 --- a/src/nat/gnunet-service-nat.c +++ b/src/nat/gnunet-service-nat.c | |||
@@ -2009,7 +2009,7 @@ client_disconnect_cb (void *cls, | |||
2009 | ch->caddrs[i].mh = NULL; | 2009 | ch->caddrs[i].mh = NULL; |
2010 | } | 2010 | } |
2011 | } | 2011 | } |
2012 | GNUNET_free_non_null (ch->caddrs); | 2012 | GNUNET_free (ch->caddrs); |
2013 | while (NULL != (lal = ch->ext_addr_head)) | 2013 | while (NULL != (lal = ch->ext_addr_head)) |
2014 | { | 2014 | { |
2015 | GNUNET_CONTAINER_DLL_remove (ch->ext_addr_head, | 2015 | GNUNET_CONTAINER_DLL_remove (ch->ext_addr_head, |
@@ -2032,8 +2032,8 @@ client_disconnect_cb (void *cls, | |||
2032 | GNUNET_RESOLVER_request_cancel (ch->ext_dns); | 2032 | GNUNET_RESOLVER_request_cancel (ch->ext_dns); |
2033 | ch->ext_dns = NULL; | 2033 | ch->ext_dns = NULL; |
2034 | } | 2034 | } |
2035 | GNUNET_free_non_null (ch->hole_external); | 2035 | GNUNET_free (ch->hole_external); |
2036 | GNUNET_free_non_null (ch->section_name); | 2036 | GNUNET_free (ch->section_name); |
2037 | GNUNET_free (ch); | 2037 | GNUNET_free (ch); |
2038 | } | 2038 | } |
2039 | 2039 | ||
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c index 69a2f4218..a3072f712 100644 --- a/src/nat/test_nat.c +++ b/src/nat/test_nat.c | |||
@@ -108,7 +108,7 @@ process_if (void *cls, | |||
108 | 108 | ||
109 | if (addr == NULL) | 109 | if (addr == NULL) |
110 | return GNUNET_OK; | 110 | return GNUNET_OK; |
111 | GNUNET_free_non_null (data->addr); | 111 | GNUNET_free (data->addr); |
112 | data->addr = GNUNET_malloc (addrlen); | 112 | data->addr = GNUNET_malloc (addrlen); |
113 | GNUNET_memcpy (data->addr, addr, addrlen); | 113 | GNUNET_memcpy (data->addr, addr, addrlen); |
114 | data->addrlen = addrlen; | 114 | data->addrlen = addrlen; |