From 708aac7550fba9994c498217bfe6f0446ff9f962 Mon Sep 17 00:00:00 2001 From: alfred Date: Fri, 28 Jun 2002 23:17:36 +0000 Subject: nuke caddr_t. --- sys/kern/uipc_usrreq.c | 4 ++-- sys/kern/vfs_cache.c | 10 +++++----- sys/kern/vfs_export.c | 19 +++++++++---------- sys/kern/vfs_subr.c | 16 +++++++--------- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 04d670c..b227d91 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -543,7 +543,7 @@ unp_attach(so) FILEDESC_UNLOCK(curproc->p_fd); LIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ? &unp_dhead : &unp_shead, unp, unp_link); - so->so_pcb = (caddr_t)unp; + so->so_pcb = unp; return (0); } @@ -1406,7 +1406,7 @@ unp_gc() } for (i = nunref, fpp = extra_ref; --i >= 0; ++fpp) closef(*fpp, (struct thread *) NULL); - free((caddr_t)extra_ref, M_TEMP); + free(extra_ref, M_TEMP); unp_gcing = 0; } diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 6fd537f..be79fc2 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -172,7 +172,7 @@ sysctl_debug_hashstat_rawnchash(SYSCTL_HANDLER_ARGS) LIST_FOREACH(ncp, ncpp, nc_hash) { count++; } - error = SYSCTL_OUT(req, (caddr_t)&count, sizeof(count)); + error = SYSCTL_OUT(req, &count, sizeof(count)); if (error) return (error); } @@ -210,16 +210,16 @@ sysctl_debug_hashstat_nchash(SYSCTL_HANDLER_ARGS) } n_nchash = nchash + 1; pct = (used * 100 * 100) / n_nchash; - error = SYSCTL_OUT(req, (caddr_t)&n_nchash, sizeof(n_nchash)); + error = SYSCTL_OUT(req, &n_nchash, sizeof(n_nchash)); if (error) return (error); - error = SYSCTL_OUT(req, (caddr_t)&used, sizeof(used)); + error = SYSCTL_OUT(req, &used, sizeof(used)); if (error) return (error); - error = SYSCTL_OUT(req, (caddr_t)&maxlength, sizeof(maxlength)); + error = SYSCTL_OUT(req, &maxlength, sizeof(maxlength)); if (error) return (error); - error = SYSCTL_OUT(req, (caddr_t)&pct, sizeof(pct)); + error = SYSCTL_OUT(req, &pct, sizeof(pct)); if (error) return (error); return (0); diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index f92ee00..ec135bd 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -124,13 +124,13 @@ vfs_hang_addrlist(mp, nep, argp) i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen; np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO); saddr = (struct sockaddr *) (np + 1); - if ((error = copyin(argp->ex_addr, (caddr_t) saddr, argp->ex_addrlen))) + if ((error = copyin(argp->ex_addr, saddr, argp->ex_addrlen))) goto out; if (saddr->sa_len > argp->ex_addrlen) saddr->sa_len = argp->ex_addrlen; if (argp->ex_masklen) { - smask = (struct sockaddr *) ((caddr_t) saddr + argp->ex_addrlen); - error = copyin(argp->ex_mask, (caddr_t) smask, argp->ex_masklen); + smask = (struct sockaddr *) (saddr + argp->ex_addrlen); + error = copyin(argp->ex_mask, smask, argp->ex_masklen); if (error) goto out; if (smask->sa_len > argp->ex_masklen) @@ -153,7 +153,7 @@ vfs_hang_addrlist(mp, nep, argp) goto out; } } - rn = (*rnh->rnh_addaddr) ((caddr_t) saddr, (caddr_t) smask, rnh, + rn = (*rnh->rnh_addaddr) (saddr, smask, rnh, np->netc_rnodes); if (rn == 0 || np != (struct netcred *) rn) { /* already exists */ error = EPERM; @@ -182,7 +182,7 @@ vfs_free_netcred(rn, w) register struct radix_node_head *rnh = (struct radix_node_head *) w; (*rnh->rnh_deladdr) (rn->rn_key, rn->rn_mask, rnh); - free((caddr_t) rn, M_NETADDR); + free(rn, M_NETADDR); return (0); } @@ -198,9 +198,8 @@ vfs_free_addrlist(nep) for (i = 0; i <= AF_MAX; i++) if ((rnh = nep->ne_rtable[i])) { - (*rnh->rnh_walktree) (rnh, vfs_free_netcred, - (caddr_t) rnh); - free((caddr_t) rnh, M_RTABLE); + (*rnh->rnh_walktree) (rnh, vfs_free_netcred, rnh); + free(rnh, M_RTABLE); nep->ne_rtable[i] = 0; } } @@ -288,7 +287,7 @@ vfs_setpublicfs(mp, nep, argp) /* * Get real filehandle for root of exported FS. */ - bzero((caddr_t)&nfs_pub.np_handle, sizeof(nfs_pub.np_handle)); + bzero(&nfs_pub.np_handle, sizeof(nfs_pub.np_handle)); nfs_pub.np_handle.fh_fsid = mp->mnt_stat.f_fsid; if ((error = VFS_ROOT(mp, &rvp))) @@ -358,7 +357,7 @@ vfs_export_lookup(mp, nam) rnh = nep->ne_rtable[saddr->sa_family]; if (rnh != NULL) { np = (struct netcred *) - (*rnh->rnh_matchaddr)((caddr_t)saddr, + (*rnh->rnh_matchaddr)(saddr, rnh); if (np && np->netc_rnodes->rn_flags & RNF_ROOT) np = NULL; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index a4581df..0575662 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -302,7 +302,7 @@ vfs_busy(mp, flags, interlkp, td) * wakeup needs to be done is at the release of the * exclusive lock at the end of dounmount. */ - msleep((caddr_t)mp, interlkp, PVFS, "vfs_busy", 0); + msleep(mp, interlkp, PVFS, "vfs_busy", 0); return (ENOENT); } lkflags = LK_SHARED | LK_NOPAUSE; @@ -985,7 +985,7 @@ vwakeup(bp) panic("vwakeup: neg numoutput"); if ((vp->v_numoutput == 0) && (vp->v_flag & VBWAIT)) { vp->v_flag &= ~VBWAIT; - wakeup((caddr_t) &vp->v_numoutput); + wakeup(&vp->v_numoutput); } } } @@ -1013,7 +1013,7 @@ vinvalbuf(vp, flags, cred, td, slpflag, slptimeo) s = splbio(); while (vp->v_numoutput) { vp->v_flag |= VBWAIT; - error = tsleep((caddr_t)&vp->v_numoutput, + error = tsleep(&vp->v_numoutput, slpflag | (PRIBIO + 1), "vinvlbuf", slptimeo); if (error) { splx(s); @@ -1750,8 +1750,7 @@ vget(vp, flags, td) #endif } else { vp->v_flag |= VXWANT; - msleep((caddr_t)vp, &vp->v_interlock, PINOD | PDROP, - "vget", 0); + msleep(vp, &vp->v_interlock, PINOD | PDROP, "vget", 0); return (ENOENT); } } @@ -2196,7 +2195,7 @@ vclean(vp, flags, td) vp->v_vxproc = NULL; if (vp->v_flag & VXWANT) { vp->v_flag &= ~VXWANT; - wakeup((caddr_t) vp); + wakeup(vp); } } @@ -2223,7 +2222,7 @@ vop_revoke(ap) */ if (vp->v_flag & VXLOCK) { vp->v_flag |= VXWANT; - msleep((caddr_t)vp, &vp->v_interlock, PINOD | PDROP, + msleep(vp, &vp->v_interlock, PINOD | PDROP, "vop_revokeall", 0); return (0); } @@ -2292,8 +2291,7 @@ vgonel(vp, td) */ if (vp->v_flag & VXLOCK) { vp->v_flag |= VXWANT; - msleep((caddr_t)vp, &vp->v_interlock, PINOD | PDROP, - "vgone", 0); + msleep(vp, &vp->v_interlock, PINOD | PDROP, "vgone", 0); return; } -- cgit v1.1