diff options
| author | Aaron Marcher <me@drkhsh.at> | 2018-05-06 22:28:56 +0200 |
|---|---|---|
| committer | Aaron Marcher <me@drkhsh.at> | 2018-05-06 22:28:56 +0200 |
| commit | ee5ec756218c852385c5ba5ef0f75b47ba59ec39 (patch) | |
| tree | 2cc3cd4e654671d509dceb572c7c72d3bfde5e9d /components/ip.c | |
| parent | 66a7fb16fc903ac7ef6ce1acdbb353f1072cd0ec (diff) | |
Fix coding style
- Use block for single statement ifs
- Keep lines to reasonable length (current debate as to reasonable)
- When functions return -1 for error test against 0 not -1
- Do not indent cases another level
- Do not test against NULL and 0 explicitly
- Use tabs for indentation, use spaces for alignment
Diffstat (limited to 'components/ip.c')
| -rw-r--r-- | components/ip.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/components/ip.c b/components/ip.c index b1f8a05..2d2cbde 100644 --- a/components/ip.c +++ b/components/ip.c @@ -18,17 +18,19 @@ ipv4(const char *iface) int s; char host[NI_MAXHOST]; - if (getifaddrs(&ifaddr) == -1) { + if (getifaddrs(&ifaddr) < 0) { fprintf(stderr, "getifaddrs: %s\n", strerror(errno)); 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)); return NULL; @@ -49,17 +51,19 @@ ipv6(const char *iface) int s; char host[NI_MAXHOST]; - if (getifaddrs(&ifaddr) == -1) { + if (getifaddrs(&ifaddr) < 0) { fprintf(stderr, "getifaddrs: %s\n", strerror(errno)); 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)); return NULL; |