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@

3 files changed, 7 insertions, 7 deletions

diff --git a/sys/arch/sparc/dev/bpp.c b/sys/arch/sparc/dev/bpp.c
index 242f4bd1292..f4648d1d721 100644
--- a/sys/arch/sparc/dev/bpp.c
+++ b/sys/arch/sparc/dev/bpp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpp.c,v 1.5 2010/08/06 00:00:38 miod Exp $	*/
+/*	$OpenBSD: bpp.c,v 1.6 2015/02/10 21:56:09 miod Exp $	*/
 
 /*
  * Copyright (c) 1997, Jason Downs.  All rights reserved.
@@ -273,7 +273,7 @@ bppwrite(dev, uio, flags)
 	int error = 0;
 
 	while ((n = min(BPP_BSIZE, uio->uio_resid)) != 0) {
-		error = uiomove(bpp->sc_cp = bpp->sc_inbuf->b_data, n, uio);
+		error = uiomovei(bpp->sc_cp = bpp->sc_inbuf->b_data, n, uio);
 		if (error != 0)
 			return error;
 		bpp->sc_count = n;
diff --git a/sys/arch/sparc/dev/flash.c b/sys/arch/sparc/dev/flash.c
index 769d21450a9..7fafa69ad92 100644
--- a/sys/arch/sparc/dev/flash.c
+++ b/sys/arch/sparc/dev/flash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flash.c,v 1.5 2006/03/15 20:03:06 miod Exp $	*/
+/*	$OpenBSD: flash.c,v 1.6 2015/02/10 21:56:09 miod Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -181,7 +181,7 @@ flashrw(dev, uio, flags)
 	if (cnt > (FLASH_REGS_SIZE - off))
 		cnt = FLASH_REGS_SIZE - off;
 
-	return (uiomove(&sc->sc_regs->regs[0] + off, cnt, uio));
+	return (uiomovei(&sc->sc_regs->regs[0] + off, cnt, uio));
 }
 
 int
diff --git a/sys/arch/sparc/dev/magma.c b/sys/arch/sparc/dev/magma.c
index dd09f1b8a0e..d512402fd7b 100644
--- a/sys/arch/sparc/dev/magma.c
+++ b/sys/arch/sparc/dev/magma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magma.c,v 1.28 2014/07/12 18:44:43 tedu Exp $	*/
+/*	$OpenBSD: magma.c,v 1.29 2015/02/10 21:56:09 miod Exp $	*/
 
 /*-
  * Copyright (c) 1998 Iain Hibbert
@@ -1675,7 +1675,7 @@ mbpp_rw(dev, uio)
 		ptr = buffer;
 
 		if (uio->uio_rw == UIO_WRITE) {
-			error = uiomove(ptr, len, uio);
+			error = uiomovei(ptr, len, uio);
 			if (error)
 				break;
 		}
@@ -1695,7 +1695,7 @@ again:		/* goto bad */
 
 		if (uio->uio_rw == UIO_READ) {
 			if (cnt) {
-				error = uiomove(ptr, cnt, uio);
+				error = uiomovei(ptr, cnt, uio);
 				if (error)
 					break;
 				gotdata++;