X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/7a9a9b7d76808744796a5ce8f890836296f05763..22175f0d5792f1d046b6b501c694a3afabc877ed:/components/ip.c

diff --git a/components/ip.c b/components/ip.c
index 422b448..fce2b66 100644
--- a/components/ip.c
+++ b/components/ip.c
@@ -1,14 +1,13 @@
 /* See LICENSE file for copyright and license details. */
-#if defined(__OpenBSD__)
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
-
 #include <errno.h>
 #include <ifaddrs.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
+#if defined(__OpenBSD__)
+	#include <sys/types.h>
+	#include <sys/socket.h>
+#endif
 
 #include "../util.h"
 
@@ -19,19 +18,21 @@ ipv4(const char *iface)
 	int s;
 	char host[NI_MAXHOST];
 
-	if (getifaddrs(&ifaddr) == -1) {
-		fprintf(stderr, "getifaddrs: %s\n", strerror(errno));
+	if (getifaddrs(&ifaddr) < 0) {
+		warn("getifaddrs:");
 		return NULL;
 	}
 
 	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr == NULL) {
+		if (!ifa->ifa_addr) {
 			continue;
 		}
-		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-		if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
+		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host,
+		                NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+		if (!strcmp(ifa->ifa_name, iface) &&
+		    (ifa->ifa_addr->sa_family == AF_INET)) {
 			if (s != 0) {
-				fprintf(stderr, "getnameinfo: %s\n", gai_strerror(s));
+				warn("getnameinfo: %s", gai_strerror(s));
 				return NULL;
 			}
 			return bprintf("%s", host);
@@ -50,19 +51,21 @@ ipv6(const char *iface)
 	int s;
 	char host[NI_MAXHOST];
 
-	if (getifaddrs(&ifaddr) == -1) {
-		fprintf(stderr, "getifaddrs: %s\n", strerror(errno));
+	if (getifaddrs(&ifaddr) < 0) {
+		warn("getifaddrs:");
 		return NULL;
 	}
 
 	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr == NULL) {
+		if (!ifa->ifa_addr) {
 			continue;
 		}
-		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-		if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET6)) {
+		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), host,
+		                NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+		if (!strcmp(ifa->ifa_name, iface) &&
+		    (ifa->ifa_addr->sa_family == AF_INET6)) {
 			if (s != 0) {
-				fprintf(stderr, "getnameinfo: %s\n", gai_strerror(s));
+				warn("getnameinfo: %s", gai_strerror(s));
 				return NULL;
 			}
 			return bprintf("%s", host);