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 /sys/kern/uipc_usrreq.c | |
| 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 'sys/kern/uipc_usrreq.c')
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 6846352..04b4c6d 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1305,7 +1305,7 @@ unp_gc() * Now check if it is possibly one of OUR sockets. */ if (fp->f_type != DTYPE_SOCKET || - (so = fp->un_data.socket) == 0) { + (so = fp->f_data) == NULL) { FILE_UNLOCK(fp); continue; } @@ -1413,9 +1413,9 @@ unp_gc() struct file *tfp = *fpp; FILE_LOCK(tfp); if (tfp->f_type == DTYPE_SOCKET && - tfp->un_data.socket != NULL) { + tfp->f_data != NULL) { FILE_UNLOCK(tfp); - sorflush(tfp->un_data.socket); + sorflush(tfp->f_data); } else FILE_UNLOCK(tfp); } |
