Consistent paramter naming for components

[slstatus.git] / components / ip.c

diff --git a/components/ip.c b/components/ip.c
index b1f8a05..a7b1bfd 100644 (file)
--- a/components/ip.c
+++ b/components/ip.c
@@ -1,36 +1,38 @@
 /* See LICENSE file for copyright and license details. */
-#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>
+       #include <sys/types.h>
+       #include <sys/socket.h>
 #endif
 
 #include "../util.h"
 
-const char *
-ipv4(const char *iface)
+static const char *
+ip(const char *interface, unsigned short sa_family)
 {
        struct ifaddrs *ifaddr, *ifa;
        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_in6),
+                               host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+               if (!strcmp(ifa->ifa_name, interface) &&
+                   (ifa->ifa_addr->sa_family == sa_family)) {
+                       freeifaddrs(ifaddr);
                        if (s != 0) {
-                               fprintf(stderr, "getnameinfo: %s\n", gai_strerror(s));
+                               warn("getnameinfo: %s", gai_strerror(s));
                                return NULL;
                        }
                        return bprintf("%s", host);
@@ -43,32 +45,13 @@ ipv4(const char *iface)
 }
 
 const char *
-ipv6(const char *iface)
+ipv4(const char *interface)
 {
-       struct ifaddrs *ifaddr, *ifa;
-       int s;
-       char host[NI_MAXHOST];
-
-       if (getifaddrs(&ifaddr) == -1) {
-               fprintf(stderr, "getifaddrs: %s\n", strerror(errno));
-               return NULL;
-       }
-
-       for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-               if (ifa->ifa_addr == NULL) {
-                       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)) {
-                       if (s != 0) {
-                               fprintf(stderr, "getnameinfo: %s\n", gai_strerror(s));
-                               return NULL;
-                       }
-                       return bprintf("%s", host);
-               }
-       }
-
-       freeifaddrs(ifaddr);
+       return ip(interface, AF_INET);
+}
 
-       return NULL;
+const char *
+ipv6(const char *interface)
+{
+       return ip(interface, AF_INET6);
 }