diff options
author | dillon <dillon@FreeBSD.org> | 2003-01-13 00:33:17 +0000 |
---|---|---|
committer | dillon <dillon@FreeBSD.org> | 2003-01-13 00:33:17 +0000 |
commit | ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8 (patch) | |
tree | ee3c8690226ac4a086122b794c975aab9319b671 /usr.bin | |
parent | fe540b81bb4ea3115544cd0f082b4ecd39cebb62 (diff) | |
download | FreeBSD-src-ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8.zip FreeBSD-src-ccd5574cc6e61b8fbf6b5ed907375f42e19b54f8.tar.gz |
Bow to the whining masses and change a union back into void *. Retain
removal of unnecessary casts and throw in some minor cleanups to see if
anyone complains, just for the hell of it.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/fstat/fstat.c | 8 | ||||
-rw-r--r-- | usr.bin/sockstat/sockstat.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index d41011a..cb002ee 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -381,21 +381,21 @@ dofiles(kp) continue; } if (file.f_type == DTYPE_VNODE) - vtrans(file.un_data.vnode, i, file.f_flag); + vtrans(file.f_data, i, file.f_flag); else if (file.f_type == DTYPE_SOCKET) { if (checkfile == 0) - socktrans(file.un_data.socket, i); + socktrans(file.f_data, i); } #ifdef DTYPE_PIPE else if (file.f_type == DTYPE_PIPE) { if (checkfile == 0) - pipetrans(file.un_data.pipe, i, file.f_flag); + pipetrans(file.f_data, i, file.f_flag); } #endif #ifdef DTYPE_FIFO else if (file.f_type == DTYPE_FIFO) { if (checkfile == 0) - vtrans(file.un_data.vnode, i, file.f_flag); + vtrans(file.f_data, i, file.f_flag); } #endif else { diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index b7b22ec..e6c7c26 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -470,9 +470,9 @@ display(void) "LOCAL ADDRESS", "FOREIGN ADDRESS"); setpassent(1); for (xf = xfiles, n = 0; n < nxfiles; ++n, ++xf) { - hash = (int)((uintptr_t)xf->xun_data.generic % HASHSIZE); + hash = (int)((uintptr_t)xf->xf_data % HASHSIZE); for (s = sockhash[hash]; s != NULL; s = s->next) - if (s->socket == xf->xun_data.socket) + if ((void *)s->socket == xf->xf_data) break; if (s == NULL) continue; |