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_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/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index aedcecc..c4d596f 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1735,7 +1735,7 @@ sopoll(struct socket *so, int events, struct ucred *active_cred, int soo_kqfilter(struct file *fp, struct knote *kn) { - struct socket *so = kn->kn_fp->un_data.socket; + struct socket *so = kn->kn_fp->f_data; struct sockbuf *sb; int s; @@ -1765,7 +1765,7 @@ soo_kqfilter(struct file *fp, struct knote *kn) static void filt_sordetach(struct knote *kn) { - struct socket *so = kn->kn_fp->un_data.socket; + struct socket *so = kn->kn_fp->f_data; int s = splnet(); SLIST_REMOVE(&so->so_rcv.sb_sel.si_note, kn, knote, kn_selnext); @@ -1778,7 +1778,7 @@ filt_sordetach(struct knote *kn) static int filt_soread(struct knote *kn, long hint) { - struct socket *so = kn->kn_fp->un_data.socket; + struct socket *so = kn->kn_fp->f_data; kn->kn_data = so->so_rcv.sb_cc - so->so_rcv.sb_ctl; if (so->so_state & SS_CANTRCVMORE) { @@ -1796,7 +1796,7 @@ filt_soread(struct knote *kn, long hint) static void filt_sowdetach(struct knote *kn) { - struct socket *so = kn->kn_fp->un_data.socket; + struct socket *so = kn->kn_fp->f_data; int s = splnet(); SLIST_REMOVE(&so->so_snd.sb_sel.si_note, kn, knote, kn_selnext); @@ -1809,7 +1809,7 @@ filt_sowdetach(struct knote *kn) static int filt_sowrite(struct knote *kn, long hint) { - struct socket *so = kn->kn_fp->un_data.socket; + struct socket *so = kn->kn_fp->f_data; kn->kn_data = sbspace(&so->so_snd); if (so->so_state & SS_CANTSENDMORE) { @@ -1831,7 +1831,7 @@ filt_sowrite(struct knote *kn, long hint) static int filt_solisten(struct knote *kn, long hint) { - struct socket *so = kn->kn_fp->un_data.socket; + struct socket *so = kn->kn_fp->f_data; kn->kn_data = so->so_qlen; return (! TAILQ_EMPTY(&so->so_comp)); |
