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@

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/tmpfs/tmpfs_subr.c b/sys/tmpfs/tmpfs_subr.c
index 01d253add02..a36eb21abba 100644
--- a/sys/tmpfs/tmpfs_subr.c
+++ b/sys/tmpfs/tmpfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tmpfs_subr.c,v 1.12 2015/01/21 22:26:52 deraadt Exp $	*/
+/*	$OpenBSD: tmpfs_subr.c,v 1.13 2015/02/10 21:56:10 miod Exp $	*/
 /*	$NetBSD: tmpfs_subr.c,v 1.79 2012/03/13 18:40:50 elad Exp $	*/
 
 /*
@@ -740,7 +740,7 @@ tmpfs_dir_getdotents(tmpfs_node_t *node, struct dirent *dp, struct uio *uio)
 		return EJUSTRETURN;
 	}
 
-	if ((error = uiomove(dp, dp->d_reclen, uio)) != 0) {
+	if ((error = uiomovei(dp, dp->d_reclen, uio)) != 0) {
 		return error;
 	}
 
@@ -837,7 +837,7 @@ tmpfs_dir_getdents(tmpfs_node_t *node, struct uio *uio)
 		}
 
 		/* Copy out the directory entry and continue. */
-		error = uiomove(&dent, dent.d_reclen, uio);
+		error = uiomovei(&dent, dent.d_reclen, uio);
 		if (error) {
 			break;
 		}
@@ -1220,7 +1220,7 @@ tmpfs_uiomove(tmpfs_node_t *node, struct uio *uio, vsize_t len)
 	if (pgoff + len < PAGE_SIZE) {
 		va = tmpfs_uio_lookup(node, pgnum);
 		if (va != (vaddr_t)NULL)
-			return uiomove((void *)va + pgoff, len, uio);
+			return uiomovei((void *)va + pgoff, len, uio);
 	}
 
 	if (len >= TMPFS_UIO_MAXBYTES) {
@@ -1244,7 +1244,7 @@ tmpfs_uiomove(tmpfs_node_t *node, struct uio *uio, vsize_t len)
 		return error;
 	}
 
-	error = uiomove((void *)va + pgoff, sz, uio);
+	error = uiomovei((void *)va + pgoff, sz, uio);
 	if (error == 0 && pgoff + sz < PAGE_SIZE)
 		tmpfs_uio_cache(node, pgnum, va);
 	else