diff options
Diffstat (limited to 'src/exit/gnunet-daemon-exit.c')
-rw-r--r-- | src/exit/gnunet-daemon-exit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index b193176c4..27eba018f 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c | |||
@@ -2471,7 +2471,7 @@ free_service_record (void *cls, | |||
2471 | key, | 2471 | key, |
2472 | service)); | 2472 | service)); |
2473 | GNUNET_CADET_close_port (service->port); | 2473 | GNUNET_CADET_close_port (service->port); |
2474 | GNUNET_free_non_null (service->name); | 2474 | GNUNET_free (service->name); |
2475 | GNUNET_free (service); | 2475 | GNUNET_free (service); |
2476 | return GNUNET_OK; | 2476 | return GNUNET_OK; |
2477 | } | 2477 | } |
@@ -2613,7 +2613,7 @@ store_service (int proto, | |||
2613 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) | 2613 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)) |
2614 | { | 2614 | { |
2615 | GNUNET_CADET_close_port (service->port); | 2615 | GNUNET_CADET_close_port (service->port); |
2616 | GNUNET_free_non_null (service->name); | 2616 | GNUNET_free (service->name); |
2617 | GNUNET_free (service); | 2617 | GNUNET_free (service); |
2618 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 2618 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
2619 | _ ("Got duplicate service records for `%s:%u'\n"), | 2619 | _ ("Got duplicate service records for `%s:%u'\n"), |
@@ -3340,7 +3340,7 @@ cleanup (void *cls) | |||
3340 | stats = NULL; | 3340 | stats = NULL; |
3341 | } | 3341 | } |
3342 | for (i = 0; i < 8; i++) | 3342 | for (i = 0; i < 8; i++) |
3343 | GNUNET_free_non_null (exit_argv[i]); | 3343 | GNUNET_free (exit_argv[i]); |
3344 | } | 3344 | } |
3345 | 3345 | ||
3346 | 3346 | ||
@@ -3706,7 +3706,7 @@ advertise_dns_exit () | |||
3706 | "dns", | 3706 | "dns", |
3707 | "DNS_RESOLVER", | 3707 | "DNS_RESOLVER", |
3708 | _ ("need a valid IPv4 or IPv6 address\n")); | 3708 | _ ("need a valid IPv4 or IPv6 address\n")); |
3709 | GNUNET_free_non_null (dns_exit); | 3709 | GNUNET_free (dns_exit); |
3710 | return; | 3710 | return; |
3711 | } | 3711 | } |
3712 | /* open port */ | 3712 | /* open port */ |
@@ -3807,7 +3807,7 @@ setup_exit_helper_args () | |||
3807 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, | 3807 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |
3808 | "EXIT", | 3808 | "EXIT", |
3809 | "IPV6ADDR"); | 3809 | "IPV6ADDR"); |
3810 | GNUNET_free_non_null (ipv6addr); | 3810 | GNUNET_free (ipv6addr); |
3811 | return GNUNET_SYSERR; | 3811 | return GNUNET_SYSERR; |
3812 | } | 3812 | } |
3813 | exit_argv[3] = ipv6addr; | 3813 | exit_argv[3] = ipv6addr; |
@@ -3858,7 +3858,7 @@ setup_exit_helper_args () | |||
3858 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, | 3858 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |
3859 | "EXIT", | 3859 | "EXIT", |
3860 | "IPV4ADDR"); | 3860 | "IPV4ADDR"); |
3861 | GNUNET_free_non_null (ipv4addr); | 3861 | GNUNET_free (ipv4addr); |
3862 | return GNUNET_SYSERR; | 3862 | return GNUNET_SYSERR; |
3863 | } | 3863 | } |
3864 | exit_argv[5] = ipv4addr; | 3864 | exit_argv[5] = ipv4addr; |
@@ -3875,7 +3875,7 @@ setup_exit_helper_args () | |||
3875 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, | 3875 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |
3876 | "EXIT", | 3876 | "EXIT", |
3877 | "IPV4MASK"); | 3877 | "IPV4MASK"); |
3878 | GNUNET_free_non_null (ipv4mask); | 3878 | GNUNET_free (ipv4mask); |
3879 | return GNUNET_SYSERR; | 3879 | return GNUNET_SYSERR; |
3880 | } | 3880 | } |
3881 | exit_argv[6] = ipv4mask; | 3881 | exit_argv[6] = ipv4mask; |
@@ -4023,7 +4023,7 @@ run (void *cls, | |||
4023 | regex = NULL; | 4023 | regex = NULL; |
4024 | else | 4024 | else |
4025 | regex = GNUNET_TUN_ipv4policy2regex (policy); | 4025 | regex = GNUNET_TUN_ipv4policy2regex (policy); |
4026 | GNUNET_free_non_null (policy); | 4026 | GNUNET_free (policy); |
4027 | if (NULL != regex) | 4027 | if (NULL != regex) |
4028 | { | 4028 | { |
4029 | (void) GNUNET_asprintf (&prefixed_regex, | 4029 | (void) GNUNET_asprintf (&prefixed_regex, |
@@ -4063,7 +4063,7 @@ run (void *cls, | |||
4063 | regex = NULL; | 4063 | regex = NULL; |
4064 | else | 4064 | else |
4065 | regex = GNUNET_TUN_ipv6policy2regex (policy); | 4065 | regex = GNUNET_TUN_ipv6policy2regex (policy); |
4066 | GNUNET_free_non_null (policy); | 4066 | GNUNET_free (policy); |
4067 | if (NULL != regex) | 4067 | if (NULL != regex) |
4068 | { | 4068 | { |
4069 | (void) GNUNET_asprintf (&prefixed_regex, | 4069 | (void) GNUNET_asprintf (&prefixed_regex, |