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/dev/streams | |
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/dev/streams')
-rw-r--r-- | sys/dev/streams/streams.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c index 039930e..4347d99 100644 --- a/sys/dev/streams/streams.c +++ b/sys/dev/streams/streams.c @@ -274,7 +274,7 @@ streamsopen(dev_t dev, int oflags, int devtype, struct thread *td) } FILEDESC_LOCK(p->p_fd); - fp->un_data.socket = so; + fp->f_data = so; fp->f_flag = FREAD|FWRITE; fp->f_ops = &svr4_netops; fp->f_type = DTYPE_SOCKET; @@ -357,7 +357,7 @@ svr4_stream_get(fp) if (fp == NULL || fp->f_type != DTYPE_SOCKET) return NULL; - so = fp->un_data.socket; + so = fp->f_data; /* * mpfixme: lock socketbuffer here @@ -395,7 +395,7 @@ svr4_delete_socket(p, fp) struct file *fp; { struct svr4_sockcache_entry *e; - void *cookie = fp->un_data.socket->so_emuldata; + void *cookie = ((struct socket *)fp->f_data)->so_emuldata; while (svr4_str_initialized != 2) { if (atomic_cmpset_acq_int(&svr4_str_initialized, 0, 1)) { @@ -418,7 +418,7 @@ svr4_delete_socket(p, fp) static int svr4_soo_close(struct file *fp, struct thread *td) { - struct socket *so = fp->un_data.socket; + struct socket *so = fp->f_data; /* CHECKUNIT_DIAG(ENXIO);*/ |