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/sys_socket.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/sys_socket.c')
-rw-r--r-- | sys/kern/sys_socket.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index c2c3076..9936cd2 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -69,7 +69,7 @@ soo_read(fp, uio, active_cred, flags, td) struct thread *td; int flags; { - struct socket *so = fp->un_data.socket; + struct socket *so = fp->f_data; int error; mtx_lock(&Giant); @@ -94,7 +94,7 @@ soo_write(fp, uio, active_cred, flags, td) struct thread *td; int flags; { - struct socket *so = fp->un_data.socket; + struct socket *so = fp->f_data; int error; mtx_lock(&Giant); @@ -119,7 +119,7 @@ soo_ioctl(fp, cmd, data, active_cred, td) struct ucred *active_cred; struct thread *td; { - register struct socket *so = fp->un_data.socket; + register struct socket *so = fp->f_data; switch (cmd) { @@ -183,7 +183,7 @@ soo_poll(fp, events, active_cred, td) struct ucred *active_cred; struct thread *td; { - struct socket *so = fp->un_data.socket; + struct socket *so = fp->f_data; return so->so_proto->pr_usrreqs->pru_sopoll(so, events, fp->f_cred, td); } @@ -195,7 +195,7 @@ soo_stat(fp, ub, active_cred, td) struct ucred *active_cred; struct thread *td; { - struct socket *so = fp->un_data.socket; + struct socket *so = fp->f_data; bzero((caddr_t)ub, sizeof (*ub)); ub->st_mode = S_IFSOCK; @@ -229,9 +229,9 @@ soo_close(fp, td) int error = 0; struct socket *so; - so = fp->un_data.socket; + so = fp->f_data; fp->f_ops = &badfileops; - fp->un_data.socket = 0; + fp->f_data = NULL; if (so) error = soclose(so); |