]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
silence clang compiler warnings
authorMark Andrews <marka@isc.org>
Fri, 2 May 2014 00:02:27 +0000 (10:02 +1000)
committerMark Andrews <marka@isc.org>
Fri, 2 May 2014 00:02:27 +0000 (10:02 +1000)
lib/irs/getaddrinfo.c

index a02705fdf31fc64a6c96bf7a3f0ebb5f46be15c0..cda7b18bff48bd272fb22ebd62e64abfa5f1ad6c 100644 (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;
@@ -459,7 +460,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 {
@@ -482,7 +483,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;
@@ -832,7 +833,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;
                }
        }
@@ -1124,7 +1125,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);
        }
 
@@ -1162,6 +1163,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) {