Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / fake-getaddrinfo.c

diff --git a/src/fake-getaddrinfo.c b/src/fake-getaddrinfo.c
index df3d34764dc9680dd1d625cd10ed94e2bdfb19d0..72db772d2c3b5bb6378e0a5555bbae077d56b48c 100644 (file)
--- a/src/fake-getaddrinfo.c
+++ b/src/fake-getaddrinfo.c
@@ -11,8 +11,6 @@
 
 #include "system.h"
 
-#include "ipv4.h"
-#include "ipv6.h"
 #include "fake-getaddrinfo.h"
 #include "xalloc.h"
 
@@ -29,7 +27,7 @@ char *gai_strerror(int ecode) {
                default:
                        return "Unknown error";
        }
-}    
+}
 #endif /* !HAVE_GAI_STRERROR */
 
 #if !HAVE_DECL_FREEADDRINFO
@@ -48,15 +46,15 @@ void freeaddrinfo(struct addrinfo *ai) {
 static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr) {
        struct addrinfo *ai;
 
-       ai = xmalloc_and_zero(sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
-       
+       ai = xzalloc(sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
+
        ai->ai_addr = (struct sockaddr *)(ai + 1);
        ai->ai_addrlen = sizeof(struct sockaddr_in);
        ai->ai_addr->sa_family = ai->ai_family = AF_INET;
 
        ((struct sockaddr_in *)(ai)->ai_addr)->sin_port = port;
        ((struct sockaddr_in *)(ai)->ai_addr)->sin_addr.s_addr = addr;
-       
+
        return ai;
 }
 
@@ -77,12 +75,12 @@ int getaddrinfo(const char *hostname, const char *servname, const struct addrinf
                *res = malloc_ai(port, htonl(0x00000000));
                return 0;
        }
-               
+
        if (!hostname) {
                *res = malloc_ai(port, htonl(0x7f000001));
                return 0;
        }
-       
+
        hp = gethostbyname(hostname);
 
        if(!hp || !hp->h_addr_list || !hp->h_addr_list[0])