aboutsummaryrefslogtreecommitdiff
path: root/src/arm/gnunet-service-arm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/arm/gnunet-service-arm.c')
-rw-r--r--src/arm/gnunet-service-arm.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 09d85ca89..5efd8b72b 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -475,7 +475,7 @@ get_server_addresses (const char *service_name,
475 (EACCES == errno)) 475 (EACCES == errno))
476 { 476 {
477 LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket"); 477 LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
478 GNUNET_free_non_null (hostname); 478 GNUNET_free (hostname);
479 GNUNET_free (unixpath); 479 GNUNET_free (unixpath);
480 return GNUNET_SYSERR; 480 return GNUNET_SYSERR;
481 } 481 }
@@ -504,7 +504,7 @@ get_server_addresses (const char *service_name,
504 _ ( 504 _ (
505 "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), 505 "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
506 service_name); 506 service_name);
507 GNUNET_free_non_null (hostname); 507 GNUNET_free (hostname);
508 return GNUNET_SYSERR; 508 return GNUNET_SYSERR;
509 } 509 }
510 if (0 == port) 510 if (0 == port)
@@ -512,8 +512,8 @@ get_server_addresses (const char *service_name,
512 saddrs = GNUNET_new_array (2, struct sockaddr *); 512 saddrs = GNUNET_new_array (2, struct sockaddr *);
513 saddrlens = GNUNET_new_array (2, socklen_t); 513 saddrlens = GNUNET_new_array (2, socklen_t);
514 add_unixpath (saddrs, saddrlens, unixpath, abstract); 514 add_unixpath (saddrs, saddrlens, unixpath, abstract);
515 GNUNET_free_non_null (unixpath); 515 GNUNET_free (unixpath);
516 GNUNET_free_non_null (hostname); 516 GNUNET_free (hostname);
517 *addrs = saddrs; 517 *addrs = saddrs;
518 *addr_lens = saddrlens; 518 *addr_lens = saddrlens;
519 return 1; 519 return 1;
@@ -537,7 +537,7 @@ get_server_addresses (const char *service_name,
537 hostname, 537 hostname,
538 gai_strerror (ret)); 538 gai_strerror (ret));
539 GNUNET_free (hostname); 539 GNUNET_free (hostname);
540 GNUNET_free_non_null (unixpath); 540 GNUNET_free (unixpath);
541 return GNUNET_SYSERR; 541 return GNUNET_SYSERR;
542 } 542 }
543 next = res; 543 next = res;
@@ -557,7 +557,7 @@ get_server_addresses (const char *service_name,
557 hostname); 557 hostname);
558 freeaddrinfo (res); 558 freeaddrinfo (res);
559 GNUNET_free (hostname); 559 GNUNET_free (hostname);
560 GNUNET_free_non_null (unixpath); 560 GNUNET_free (unixpath);
561 return GNUNET_SYSERR; 561 return GNUNET_SYSERR;
562 } 562 }
563 resi = i; 563 resi = i;
@@ -664,7 +664,7 @@ get_server_addresses (const char *service_name,
664 ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); 664 ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
665 } 665 }
666 } 666 }
667 GNUNET_free_non_null (unixpath); 667 GNUNET_free (unixpath);
668 *addrs = saddrs; 668 *addrs = saddrs;
669 *addr_lens = saddrlens; 669 *addr_lens = saddrlens;
670 return resi; 670 return resi;
@@ -1132,8 +1132,8 @@ free_service (struct ServiceList *sl)
1132 GNUNET_assert (GNUNET_YES == in_shutdown); 1132 GNUNET_assert (GNUNET_YES == in_shutdown);
1133 GNUNET_CONTAINER_DLL_remove (running_head, running_tail, sl); 1133 GNUNET_CONTAINER_DLL_remove (running_head, running_tail, sl);
1134 GNUNET_assert (NULL == sl->listen_head); 1134 GNUNET_assert (NULL == sl->listen_head);
1135 GNUNET_free_non_null (sl->config); 1135 GNUNET_free (sl->config);
1136 GNUNET_free_non_null (sl->binary); 1136 GNUNET_free (sl->binary);
1137 GNUNET_free (sl->name); 1137 GNUNET_free (sl->name);
1138 GNUNET_free (sl); 1138 GNUNET_free (sl);
1139} 1139}