diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2015-02-10 21:56:11 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2015-02-10 21:56:11 +0000 |
| commit | fb06ed88b5810f53d16a2f3f90904ed7ea4de07a (patch) | |
| tree | 0ad268ca945306e22e87692f6bb02fcd1220d0e4 /sys/isofs | |
| parent | 4ed4205fc6bdb404dcf67f9f19347eea957f5982 (diff) | |
First step towards making uiomove() take a size_t size argument:
- rename uiomove() to uiomovei() and update all its users.
- introduce uiomove(), which is similar to uiomovei() but with a size_t.
- rewrite uiomovei() as an uiomove() wrapper.
ok kettenis@
Diffstat (limited to 'sys/isofs')
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vnops.c | 8 | ||||
| -rw-r--r-- | sys/isofs/udf/udf_vnops.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index a13c2776920..00c0b30c987 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vnops.c,v 1.69 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: cd9660_vnops.c,v 1.70 2015/02/10 21:56:09 miod Exp $ */ /* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */ /*- @@ -273,7 +273,7 @@ cd9660_read(void *v) return (error); } - error = uiomove(bp->b_data + on, (int)n, uio); + error = uiomovei(bp->b_data + on, (int)n, uio); brelse(bp); } while (error == 0 && uio->uio_resid > 0 && n != 0); @@ -341,7 +341,7 @@ iso_uiodir(idp,dp,off) } dp->d_off = off; - if ((error = uiomove((caddr_t)dp, dp->d_reclen, idp->uio)) != 0) + if ((error = uiomovei((caddr_t)dp, dp->d_reclen, idp->uio)) != 0) return (error); idp->uio_off = off; return (0); @@ -654,7 +654,7 @@ cd9660_readlink(void *v) */ if (uio->uio_segflg != UIO_SYSSPACE || uio->uio_iov->iov_len < MAXPATHLEN) { - error = uiomove(symname, symlen, uio); + error = uiomovei(symname, symlen, uio); pool_put(&namei_pool, symname); return (error); } diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c index 260f925c35e..f838f18d255 100644 --- a/sys/isofs/udf/udf_vnops.c +++ b/sys/isofs/udf/udf_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vnops.c,v 1.58 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: udf_vnops.c,v 1.59 2015/02/10 21:56:09 miod Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -452,7 +452,7 @@ udf_read(void *v) size = fsize - offset; error = udf_readatoffset(up, &size, offset, &bp, &data); if (error == 0) - error = uiomove(data, size, uio); + error = uiomovei(data, size, uio); if (bp != NULL) { brelse(bp); bp = NULL; @@ -553,7 +553,7 @@ udf_uiodir(struct udf_uiodir *uiodir, struct uio *uio, long off) uiodir->dirent->d_off = off; uiodir->dirent->d_reclen = de_size; - return (uiomove(uiodir->dirent, de_size, uio)); + return (uiomovei(uiodir->dirent, de_size, uio)); } static struct udf_dirstream * |