pbentes/slstatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of err.h as it is not portable

Browse Source 
Replace warn() and warnx() with fprintf() and add <stdio.h> where
necessary.
This commit is contained in:
Aaron Marcher
2018-03-28 18:26:56 +02:00
parent aced832622
commit 96f3a8a54e
13 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/ip.c
View File

@ -1,6 +1,5 @@
/* See LICENSE file for copyright and license details. */
#if defined(__linux__)
#include <err.h>
#include <ifaddrs.h>
#include <netdb.h>
#include <stdio.h>
@ -16,7 +15,7 @@ ipv4(const char *iface)
char host[NI_MAXHOST];
if (getifaddrs(&ifaddr) == -1) {
warn("Failed to get IPv4 address for interface %s", iface);
fprintf(stderr, "Failed to get IPv4 address for interface %s", iface);
return NULL;
}
@ -27,7 +26,7 @@ ipv4(const char *iface)
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)) {
if (s != 0) {
warnx("Failed to get IPv4 address for interface %s", iface);
fprintf(stderr, "Failed to get IPv4 address for interface %s", iface);
return NULL;
}
return bprintf("%s", host);
@ -47,7 +46,7 @@ ipv6(const char *iface)
char host[NI_MAXHOST];
if (getifaddrs(&ifaddr) == -1) {
warn("Failed to get IPv6 address for interface %s", iface);
fprintf(stderr, "Failed to get IPv6 address for interface %s", iface);
return NULL;
}
@ -58,7 +57,7 @@ ipv6(const char *iface)
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) {
warnx("Failed to get IPv6 address for interface %s", iface);
fprintf(stderr, "Failed to get IPv6 address for interface %s", iface);
return NULL;
}
return bprintf("%s", host);