diff options
author | des <des@FreeBSD.org> | 2003-03-02 15:50:23 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2003-03-02 15:50:23 +0000 |
commit | 765ebc59b49b789f220d5975fee1fafe86545825 (patch) | |
tree | 766aa4287191c9a533e33cf6294817571b513579 /sys/fs | |
parent | 8ebe566c39e599ebbb91bc2ea8c7c2fc0c455ace (diff) | |
download | FreeBSD-src-765ebc59b49b789f220d5975fee1fafe86545825.zip FreeBSD-src-765ebc59b49b789f220d5975fee1fafe86545825.tar.gz |
uiomove-related caddr_t -> void * (just the low-hanging fruit)
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/msdosfs/msdosfs_vnops.c | 6 | ||||
-rw-r--r-- | sys/fs/nwfs/nwfs_io.c | 2 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_io.c | 4 | ||||
-rw-r--r-- | sys/fs/udf/udf_vnops.c | 4 |
7 files changed, 10 insertions, 12 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 0b892e6..b496c5f 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -361,7 +361,7 @@ iso_uiodir(idp,dp,off) --idp->ncookies; } - if ((error = uiomove((caddr_t) dp,dp->d_reclen,idp->uio)) != 0) + if ((error = uiomove(dp, dp->d_reclen, idp->uio)) != 0) return (error); idp->uio_off = off; return (0); diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 6b6683a..81cf8df 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -599,7 +599,7 @@ devfs_readdir(ap) dp->d_fileno = de->de_inode; if (off >= uio->uio_offset) { ncookies++; - error = uiomove((caddr_t)dp, dp->d_reclen, uio); + error = uiomove(dp, dp->d_reclen, uio); if (error) break; } diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 2225220..527987b 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -476,7 +476,7 @@ fdesc_readdir(ap) * And ship to userland */ FILEDESC_UNLOCK(fdp); - error = uiomove((caddr_t) dp, UIO_MX, uio); + error = uiomove(dp, UIO_MX, uio); if (error) goto done; FILEDESC_LOCK(fdp); diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index c92c83a..3d439d3 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1545,8 +1545,7 @@ msdosfs_readdir(ap) dirbuf.d_reclen = GENERIC_DIRSIZ(&dirbuf); if (uio->uio_resid < dirbuf.d_reclen) goto out; - error = uiomove((caddr_t) &dirbuf, - dirbuf.d_reclen, uio); + error = uiomove(&dirbuf, dirbuf.d_reclen, uio); if (error) goto out; offset += sizeof(struct direntry); @@ -1668,8 +1667,7 @@ msdosfs_readdir(ap) brelse(bp); goto out; } - error = uiomove((caddr_t) &dirbuf, - dirbuf.d_reclen, uio); + error = uiomove(&dirbuf, dirbuf.d_reclen, uio); if (error) { brelse(bp); goto out; diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c index f1cd83c..cca1c2e 100644 --- a/sys/fs/nwfs/nwfs_io.c +++ b/sys/fs/nwfs/nwfs_io.c @@ -146,7 +146,7 @@ nwfs_readvdir(struct vnode *vp, struct uio *uio, struct ucred *cred) { error = 0; break; } - if ((error = uiomove((caddr_t)&dp, DE_SIZE, uio))) + if ((error = uiomove(&dp, DE_SIZE, uio))) break; } diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 9aa4224..11c1e3c 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -109,7 +109,7 @@ smbfs_readvdir(struct vnode *vp, struct uio *uio, struct ucred *cred) de.d_name[1] = '.'; de.d_name[offset + 1] = '\0'; de.d_type = DT_DIR; - error = uiomove((caddr_t)&de, DE_SIZE, uio); + error = uiomove(&de, DE_SIZE, uio); if (error) return error; offset++; @@ -165,7 +165,7 @@ smbfs_readvdir(struct vnode *vp, struct uio *uio, struct ucred *cred) vput(newvp); } } - error = uiomove((caddr_t)&de, DE_SIZE, uio); + error = uiomove(&de, DE_SIZE, uio); if (error) break; } diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index 8d9be57..c5d8d36 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -406,7 +406,7 @@ udf_read(struct vop_read_args *a) error = udf_readatoffset(node, &size, offset, &bp, &data); if (error) return (error); - error = uiomove((caddr_t)data, size, uio); + error = uiomove(data, size, uio); if (bp != NULL) brelse(bp); if (error) @@ -524,7 +524,7 @@ udf_uiodir(struct udf_uiodir *uiodir, int de_size, struct uio *uio, long cookie) return (-1); } - return (uiomove((caddr_t)uiodir->dirent, de_size, uio)); + return (uiomove(uiodir->dirent, de_size, uio)); } static struct udf_dirstream * |