diff options
| -rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 12 | ||||
| -rw-r--r-- | sys/miscfs/nullfs/null_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/portal/portal_vnops.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 0ac5f3e37f0..2d6343c1095 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fifo_vnops.c,v 1.20 2004/05/14 21:33:58 millert Exp $ */ +/* $OpenBSD: fifo_vnops.c,v 1.21 2004/05/18 12:37:51 pedro Exp $ */ /* $NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $ */ /* @@ -327,13 +327,13 @@ fifo_ioctl(v) if (ap->a_command == FIONBIO) return (0); if (ap->a_fflag & FREAD) { - filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock; + filetmp.f_data = ap->a_vp->v_fifoinfo->fi_readsock; error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_p); if (error) return (error); } if (ap->a_fflag & FWRITE) { - filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock; + filetmp.f_data = ap->a_vp->v_fifoinfo->fi_writesock; error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_p); if (error) return (error); @@ -366,13 +366,13 @@ fifo_poll(v) if (ap->a_events & (POLLIN | POLLRDNORM)) ap->a_vp->v_fifoinfo->fi_readsock->so_state &= ~SS_CANTRCVMORE; - filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock; + filetmp.f_data = ap->a_vp->v_fifoinfo->fi_readsock; if (filetmp.f_data) revents |= soo_poll(&filetmp, ap->a_events, ap->a_p); ap->a_vp->v_fifoinfo->fi_readsock->so_state = ostate; } if (ap->a_events & (POLLOUT | POLLWRNORM | POLLWRBAND)) { - filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock; + filetmp.f_data = ap->a_vp->v_fifoinfo->fi_writesock; if (filetmp.f_data) revents |= soo_poll(&filetmp, ap->a_events, ap->a_p); } @@ -591,7 +591,7 @@ fifo_kqfilter(v) return (1); } - ap->a_kn->kn_hook = (caddr_t)so; + ap->a_kn->kn_hook = so; SLIST_INSERT_HEAD(&sb->sb_sel.si_note, ap->a_kn, kn_selnext); sb->sb_flags |= SB_KNOTE; diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index 78ac48b46ab..682881c1684 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: null_vfsops.c,v 1.19 2004/05/18 02:23:41 pedro Exp $ */ +/* $OpenBSD: null_vfsops.c,v 1.20 2004/05/18 12:37:51 pedro Exp $ */ /* $NetBSD: null_vfsops.c,v 1.38 2002/09/21 18:09:29 christos Exp $ */ /* @@ -125,7 +125,7 @@ nullfs_mount(mp, path, data, ndp, p) /* * Get argument */ - error = copyin(data, (caddr_t)&args, sizeof(struct null_args)); + error = copyin(data, &args, sizeof(struct null_args)); if (error) return (error); @@ -159,7 +159,7 @@ nullfs_mount(mp, path, data, ndp, p) */ nmp = (struct null_mount *) malloc(sizeof(struct null_mount), M_UFSMNT, M_WAITOK); /* XXX */ - memset((caddr_t)nmp, 0, sizeof(struct null_mount)); + memset(nmp, 0, sizeof(struct null_mount)); mp->mnt_data = (qaddr_t)nmp; nmp->nullm_vfs = lowerrootvp->v_mount; diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index f50ebe32438..31b52b61c4a 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: portal_vnops.c,v 1.18 2004/04/23 17:43:48 tedu Exp $ */ +/* $OpenBSD: portal_vnops.c,v 1.19 2004/05/18 12:37:51 pedro Exp $ */ /* $NetBSD: portal_vnops.c,v 1.17 1996/02/13 13:12:57 mycroft Exp $ */ /* @@ -363,7 +363,7 @@ portal_open(v) splx(s); goto bad; } - (void) tsleep((caddr_t) &so->so_timeo, PSOCK, "portalcon", 5 * hz); + (void) tsleep(&so->so_timeo, PSOCK, "portalcon", 5 * hz); } splx(s); @@ -386,7 +386,7 @@ portal_open(v) pcred.pcr_gid = ap->a_cred->cr_gid; pcred.pcr_ngroups = ap->a_cred->cr_ngroups; bcopy(ap->a_cred->cr_groups, pcred.pcr_groups, NGROUPS * sizeof(gid_t)); - aiov[0].iov_base = (caddr_t) &pcred; + aiov[0].iov_base = &pcred; aiov[0].iov_len = sizeof(pcred); aiov[1].iov_base = pt->pt_arg; aiov[1].iov_len = pt->pt_size; @@ -624,7 +624,7 @@ portal_reclaim(v) struct portalnode *pt = VTOPORTAL(ap->a_vp); if (pt->pt_arg) { - free((caddr_t) pt->pt_arg, M_TEMP); + free(pt->pt_arg, M_TEMP); pt->pt_arg = 0; } FREE(ap->a_vp->v_data, M_TEMP); |