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/transport/plugin_transport_tcp.c | |
parent | 1437556645417e6302862845e7ebcbd4c9908357 (diff) | |
download | gnunet-e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2.tar.gz gnunet-e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2.zip |
GNUNET_free_non_null -> GNUNET_free
Diffstat (limited to 'src/transport/plugin_transport_tcp.c')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 4cec181b0..e3bc21543 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -1186,7 +1186,7 @@ get_server_addresses (const char *service_name, | |||
1186 | (EACCES == errno)) | 1186 | (EACCES == errno)) |
1187 | { | 1187 | { |
1188 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); | 1188 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); |
1189 | GNUNET_free_non_null (hostname); | 1189 | GNUNET_free (hostname); |
1190 | GNUNET_free (unixpath); | 1190 | GNUNET_free (unixpath); |
1191 | return GNUNET_SYSERR; | 1191 | return GNUNET_SYSERR; |
1192 | } | 1192 | } |
@@ -1212,7 +1212,7 @@ get_server_addresses (const char *service_name, | |||
1212 | _ ( | 1212 | _ ( |
1213 | "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), | 1213 | "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), |
1214 | service_name); | 1214 | service_name); |
1215 | GNUNET_free_non_null (hostname); | 1215 | GNUNET_free (hostname); |
1216 | return GNUNET_SYSERR; | 1216 | return GNUNET_SYSERR; |
1217 | } | 1217 | } |
1218 | if (0 == port) | 1218 | if (0 == port) |
@@ -1220,8 +1220,8 @@ get_server_addresses (const char *service_name, | |||
1220 | saddrs = GNUNET_malloc (2 * sizeof(struct sockaddr *)); | 1220 | saddrs = GNUNET_malloc (2 * sizeof(struct sockaddr *)); |
1221 | saddrlens = GNUNET_malloc (2 * sizeof(socklen_t)); | 1221 | saddrlens = GNUNET_malloc (2 * sizeof(socklen_t)); |
1222 | add_unixpath (saddrs, saddrlens, unixpath, abstract); | 1222 | add_unixpath (saddrs, saddrlens, unixpath, abstract); |
1223 | GNUNET_free_non_null (unixpath); | 1223 | GNUNET_free (unixpath); |
1224 | GNUNET_free_non_null (hostname); | 1224 | GNUNET_free (hostname); |
1225 | *addrs = saddrs; | 1225 | *addrs = saddrs; |
1226 | *addr_lens = saddrlens; | 1226 | *addr_lens = saddrlens; |
1227 | return 1; | 1227 | return 1; |
@@ -1245,7 +1245,7 @@ get_server_addresses (const char *service_name, | |||
1245 | hostname, | 1245 | hostname, |
1246 | gai_strerror (ret)); | 1246 | gai_strerror (ret)); |
1247 | GNUNET_free (hostname); | 1247 | GNUNET_free (hostname); |
1248 | GNUNET_free_non_null (unixpath); | 1248 | GNUNET_free (unixpath); |
1249 | return GNUNET_SYSERR; | 1249 | return GNUNET_SYSERR; |
1250 | } | 1250 | } |
1251 | next = res; | 1251 | next = res; |
@@ -1265,7 +1265,7 @@ get_server_addresses (const char *service_name, | |||
1265 | hostname); | 1265 | hostname); |
1266 | freeaddrinfo (res); | 1266 | freeaddrinfo (res); |
1267 | GNUNET_free (hostname); | 1267 | GNUNET_free (hostname); |
1268 | GNUNET_free_non_null (unixpath); | 1268 | GNUNET_free (unixpath); |
1269 | return GNUNET_SYSERR; | 1269 | return GNUNET_SYSERR; |
1270 | } | 1270 | } |
1271 | resi = i; | 1271 | resi = i; |
@@ -1372,7 +1372,7 @@ get_server_addresses (const char *service_name, | |||
1372 | ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); | 1372 | ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); |
1373 | } | 1373 | } |
1374 | } | 1374 | } |
1375 | GNUNET_free_non_null (unixpath); | 1375 | GNUNET_free (unixpath); |
1376 | *addrs = saddrs; | 1376 | *addrs = saddrs; |
1377 | *addr_lens = saddrlens; | 1377 | *addr_lens = saddrlens; |
1378 | return resi; | 1378 | return resi; |
@@ -3163,7 +3163,7 @@ handle_tcp_welcome (void *cls, | |||
3163 | else | 3163 | else |
3164 | { | 3164 | { |
3165 | GNUNET_break (0); | 3165 | GNUNET_break (0); |
3166 | GNUNET_free_non_null (vaddr); | 3166 | GNUNET_free (vaddr); |
3167 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 3167 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
3168 | return; | 3168 | return; |
3169 | } | 3169 | } |
@@ -3267,7 +3267,7 @@ handle_tcp_data (void *cls, | |||
3267 | GNUNET_a2s (vaddr, alen)); | 3267 | GNUNET_a2s (vaddr, alen)); |
3268 | GNUNET_break_op (0); | 3268 | GNUNET_break_op (0); |
3269 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 3269 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
3270 | GNUNET_free_non_null (vaddr); | 3270 | GNUNET_free (vaddr); |
3271 | return; | 3271 | return; |
3272 | } | 3272 | } |
3273 | if (GNUNET_YES == session->expecting_welcome) | 3273 | if (GNUNET_YES == session->expecting_welcome) |
@@ -3284,7 +3284,7 @@ handle_tcp_data (void *cls, | |||
3284 | GNUNET_a2s (vaddr, alen)); | 3284 | GNUNET_a2s (vaddr, alen)); |
3285 | GNUNET_break_op (0); | 3285 | GNUNET_break_op (0); |
3286 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 3286 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
3287 | GNUNET_free_non_null (vaddr); | 3287 | GNUNET_free (vaddr); |
3288 | return; | 3288 | return; |
3289 | } | 3289 | } |
3290 | 3290 | ||
@@ -3300,7 +3300,7 @@ handle_tcp_data (void *cls, | |||
3300 | (unsigned int) ntohs (message->type), | 3300 | (unsigned int) ntohs (message->type), |
3301 | GNUNET_i2s (&session->target), | 3301 | GNUNET_i2s (&session->target), |
3302 | GNUNET_a2s (vaddr, alen)); | 3302 | GNUNET_a2s (vaddr, alen)); |
3303 | GNUNET_free_non_null (vaddr); | 3303 | GNUNET_free (vaddr); |
3304 | } | 3304 | } |
3305 | 3305 | ||
3306 | GNUNET_STATISTICS_update (plugin->env->stats, | 3306 | GNUNET_STATISTICS_update (plugin->env->stats, |
@@ -3802,8 +3802,8 @@ libgnunet_plugin_transport_tcp_init (void *cls) | |||
3802 | plugin); | 3802 | plugin); |
3803 | for (ret = ret_s - 1; ret >= 0; ret--) | 3803 | for (ret = ret_s - 1; ret >= 0; ret--) |
3804 | GNUNET_free (addrs[ret]); | 3804 | GNUNET_free (addrs[ret]); |
3805 | GNUNET_free_non_null (addrs); | 3805 | GNUNET_free (addrs); |
3806 | GNUNET_free_non_null (addrlens); | 3806 | GNUNET_free (addrlens); |
3807 | } | 3807 | } |
3808 | else | 3808 | else |
3809 | { | 3809 | { |
@@ -3893,7 +3893,7 @@ die: | |||
3893 | if (NULL != service) | 3893 | if (NULL != service) |
3894 | LEGACY_SERVICE_stop (service); | 3894 | LEGACY_SERVICE_stop (service); |
3895 | GNUNET_free (plugin); | 3895 | GNUNET_free (plugin); |
3896 | GNUNET_free_non_null (api); | 3896 | GNUNET_free (api); |
3897 | return NULL; | 3897 | return NULL; |
3898 | } | 3898 | } |
3899 | 3899 | ||