cleanup patches from Peter Breitenlohner Daniel
* nanoftp.c nanohttp.c: cleanup patches from Peter Breitenlohner
Daniel
diff --git a/nanohttp.c b/nanohttp.c
index 0034a17..b645720 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -996,14 +996,13 @@
}
for (res = result; res; res = res->ai_next) {
- if (res) {
+ if (res->ai_family == AF_INET || res->ai_family == AF_INET6) {
if (res->ai_family == AF_INET6) {
memcpy (&sockin6, res->ai_addr, res->ai_addrlen);
sockin6.sin6_port = htons (port);
addr = (struct sockaddr *)&sockin6;
}
-
- if (res->ai_family == AF_INET) {
+ else {
memcpy (&sockin, res->ai_addr, res->ai_addrlen);
sockin.sin_port = htons (port);
addr = (struct sockaddr *)&sockin;
@@ -1015,11 +1014,10 @@
return (s);
}
}
- else {
- freeaddrinfo (result);
- return (-1);
- }
}
+ if (result)
+ freeaddrinfo (result);
+ return (-1);
} else
#endif
#endif