diff options
author | tuexen <tuexen@FreeBSD.org> | 2015-06-13 19:56:04 +0000 |
---|---|---|
committer | tuexen <tuexen@FreeBSD.org> | 2015-06-13 19:56:04 +0000 |
commit | 199422d7cbcc67075bb11efbfd39d572162dfe76 (patch) | |
tree | d11b916da98fbc78113c4dd0275af9933fe1f404 /usr.bin | |
parent | a38a487b8c1768edbfbaa884bb34ff148ef3c0cf (diff) | |
download | FreeBSD-src-199422d7cbcc67075bb11efbfd39d572162dfe76.zip FreeBSD-src-199422d7cbcc67075bb11efbfd39d572162dfe76.tar.gz |
Simplify printaddr(). No functional change.
MFC after: 3 days
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/sockstat/sockstat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index c80c833..5ee157b 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -496,14 +496,14 @@ getfiles(void) } static int -printaddr(int af, struct sockaddr_storage *ss) +printaddr(struct sockaddr_storage *ss) { char addrstr[INET6_ADDRSTRLEN] = { '\0', '\0' }; struct sockaddr_un *sun; void *addr = NULL; /* Keep compiler happy. */ int off, port = 0; - switch (af) { + switch (ss->ss_family) { case AF_INET: addr = &((struct sockaddr_in *)ss)->sin_addr; if (inet_lnaof(*(struct in_addr *)addr) == INADDR_ANY) @@ -522,7 +522,7 @@ printaddr(int af, struct sockaddr_storage *ss) return (xprintf("%.*s", sun->sun_len - off, sun->sun_path)); } if (addrstr[0] == '\0') - inet_ntop(af, addr, addrstr, sizeof addrstr); + inet_ntop(ss->ss_family, addr, addrstr, sizeof addrstr); if (port == 0) return xprintf("%s:*", addrstr); else @@ -613,17 +613,17 @@ displaysock(struct sock *s, int pos) switch (s->family) { case AF_INET: case AF_INET6: - pos += printaddr(s->family, &s->laddr); + pos += printaddr(&s->laddr); if (s->family == AF_INET6 && pos >= 58) pos += xprintf(" "); while (pos < 58) pos += xprintf(" "); - pos += printaddr(s->family, &s->faddr); + pos += printaddr(&s->faddr); break; case AF_UNIX: /* server */ if (s->laddr.ss_len > 0) { - pos += printaddr(s->family, &s->laddr); + pos += printaddr(&s->laddr); break; } /* client */ @@ -643,7 +643,7 @@ displaysock(struct sock *s, int pos) if (s == NULL || s->laddr.ss_len == 0) pos += xprintf("??"); else - pos += printaddr(s->family, &s->laddr); + pos += printaddr(&s->laddr); break; default: abort(); |