upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-12 09:29:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

silence clang compiler warnings

Browse source 
(cherry picked from commit d26c36b1d9)
This commit is contained in:
Mark Andrews 2014-05-02 10:02:27 +10:00
parent 552aa69013
commit 854e0dc55b
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/irs/getaddrinfo.c
View file

@ -178,6 +178,7 @@ static int add_ipv6(const char *hostname, int flags, struct addrinfo **aip,
int socktype, int port);
static void set_order(int, int (**)(const char *, int, struct addrinfo **,
int, int));
static void _freeaddrinfo(struct addrinfo *ai);
#define FOUND_IPV4 0x1
#define FOUND_IPV6 0x2
@ -339,7 +340,7 @@ getaddrinfo(const char *hostname, const char *servname,
if (family == AF_INET6 || family == 0) {
ai = ai_alloc(AF_INET6, sizeof(struct sockaddr_in6));
if (ai == NULL) {
freeaddrinfo(ai_list);
_freeaddrinfo(ai_list);
return (EAI_MEMORY);
}
ai->ai_socktype = socktype;
@ -458,7 +459,7 @@ getaddrinfo(const char *hostname, const char *servname,
NI_NUMERICHOST) == 0) {
ai->ai_canonname = strdup(nbuf);
if (ai->ai_canonname == NULL) {
freeaddrinfo(ai);
_freeaddrinfo(ai);
return (EAI_MEMORY);
}
} else {
@ -481,7 +482,7 @@ getaddrinfo(const char *hostname, const char *servname,
socktype, port);
if (err != 0) {
if (ai_list != NULL) {
freeaddrinfo(ai_list);
_freeaddrinfo(ai_list);
ai_list = NULL;
}
break;
@ -831,7 +832,7 @@ process_answer(isc_task_t *task, isc_event_t *event) {
error = EAI_NONAME;
} else {
if (trans->ai_sentinel.ai_next != NULL) {
freeaddrinfo(trans->ai_sentinel.ai_next);
_freeaddrinfo(trans->ai_sentinel.ai_next);
trans->ai_sentinel.ai_next = NULL;
}
}
@ -1123,7 +1124,7 @@ add_ipv4(const char *hostname, int flags, struct addrinfo **aip,
ai = ai_clone(*aip, AF_INET); /* don't use ai_clone() */
if (ai == NULL) {
freeaddrinfo(*aip);
_freeaddrinfo(*aip);
return (EAI_MEMORY);
}
@ -1161,6 +1162,11 @@ add_ipv6(const char *hostname, int flags, struct addrinfo **aip,
/*% Free address info. */
void
freeaddrinfo(struct addrinfo *ai) {
_freeaddrinfo(ai);
}
static void
_freeaddrinfo(struct addrinfo *ai) {
struct addrinfo *ai_next;
while (ai != NULL) {