Remove now unused legacy uiomovei() function.

All its callers got reviewed and converted to
use uiomove() properly.

ok deraadt@

5 files changed, 8 insertions, 31 deletions

diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 16e83b42da7..123a722681b 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -6765,7 +6765,6 @@
 ./usr/share/man/man9/uao_reference.9
 ./usr/share/man/man9/uio.9
 ./usr/share/man/man9/uiomove.9
-./usr/share/man/man9/uiomovei.9
 ./usr/share/man/man9/ulmax.9
 ./usr/share/man/man9/ulmin.9
 ./usr/share/man/man9/uprintf.9
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 2b39f54c389..a0c0d20c06b 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.271 2015/12/20 08:10:36 sf Exp $
+#	$OpenBSD: Makefile,v 1.272 2016/03/15 04:19:26 stefan Exp $
 #	$NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
@@ -418,7 +418,7 @@ MLINKS+=timeout.9 timeout_add.9 timeout.9 timeout_set.9 \
 MLINKS+=tsleep.9 wakeup.9 tsleep.9 wakeup_n.9 tsleep.9 wakeup_one.9 \
 	tsleep.9 msleep.9 
 MLINKS+=tvtohz.9 tstohz.9
-MLINKS+=uiomove.9 uio.9 uiomove.9 uiomovei.9
+MLINKS+=uiomove.9 uio.9
 MLINKS+=usbd_close_pipe.9 usbd_abort_pipe.9
 MLINKS+=usbd_open_pipe.9 usbd_open_pipe_intr.9
 MLINKS+=usbd_transfer.9 usbd_setup_xfer.9
diff --git a/share/man/man9/uiomove.9 b/share/man/man9/uiomove.9
index 8fa8919498d..58bf2abb158 100644
--- a/share/man/man9/uiomove.9
+++ b/share/man/man9/uiomove.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uiomove.9,v 1.17 2015/11/23 17:53:57 jmc Exp $
+.\"	$OpenBSD: uiomove.9,v 1.18 2016/03/15 04:19:26 stefan Exp $
 .\"	$NetBSD: uiomove.9,v 1.6 2001/12/26 00:16:30 wiz Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -25,19 +25,16 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 23 2015 $
+.Dd $Mdocdate: March 15 2016 $
 .Dt UIOMOVE 9
 .Os
 .Sh NAME
-.Nm uiomove ,
-.Nm uiomovei
+.Nm uiomove
 .Nd move data described by a struct uio
 .Sh SYNOPSIS
 .In sys/systm.h
 .Ft int
 .Fn uiomove "void *buf" "size_t n" "struct uio *uio"
-.Ft int
-.Fn uiomovei "void *buf" "int n" "struct uio *uio"
 .Sh DESCRIPTION
 The
 .Nm
@@ -133,17 +130,8 @@ to point that much farther into the region described.
 This allows multiple calls to
 .Nm
 to easily be used to fill or drain the region of data.
-.Pp
-The
-.Nm uiomovei
-function is similar to
-.Nm uiomove ,
-but uses a signed integer as the byte count.
-It is a temporary legacy interface and should not be used in new code.
 .Sh RETURN VALUES
 .Nm
-and
-.Nm uiomovei
-return 0 on success or EFAULT if a bad address is encountered.
+returs 0 on success or EFAULT if a bad address is encountered.
 .Sh SEE ALSO
 .Xr copy 9
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index c002707fc84..1b91e391c8e 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_subr.c,v 1.46 2016/02/11 18:59:15 stefan Exp $	*/
+/*	$OpenBSD: kern_subr.c,v 1.47 2016/03/15 04:19:26 stefan Exp $	*/
 /*	$NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $	*/
 
 /*
@@ -105,15 +105,6 @@ uiomove(void *cp, size_t n, struct uio *uio)
 	return (error);
 }
 
-int
-uiomovei(void *cp, int n, struct uio *uio)
-{
-	if (n < 0)
-		return 0;
-
-	return uiomove(cp, (size_t)n, uio);
-}
-
 /*
  * Give next character to user as result of read.
  */
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index f246f7f4bfa..9f90a4ff1de 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systm.h,v 1.109 2015/12/11 16:07:02 mpi Exp $	*/
+/*	$OpenBSD: systm.h,v 1.110 2016/03/15 04:19:26 stefan Exp $	*/
 /*	$NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $	*/
 
 /*-
@@ -290,7 +290,6 @@ void	dohooks(struct hook_desc_head *, int);
 
 struct uio;
 int	uiomove(void *, size_t, struct uio *);
-int	uiomovei(void *, int, struct uio *);
 
 #if defined(_KERNEL)
 __returns_twice int	setjmp(label_t *);