From d5279f20c5747addc29c63b7748ba5d60f53259d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Sun, 2 Mar 2003 15:29:13 +0000
Subject: [PATCH] Convert one of our main caddr_t consumers, uiomove(9), to
 void *.

---
 sys/kern/kern_subr.c | 10 +++++-----
 sys/sys/uio.h        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index c8d3ed07a131..a4bbcee1c7bb 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -126,7 +126,7 @@ vm_pgmoveco(vm_map_t mapa, vm_object_t srcobj, vm_offset_t kaddr,
 #endif /* ZERO_COPY_SOCKETS */
 
 int
-uiomove(caddr_t cp, int n, struct uio *uio)
+uiomove(void *cp, int n, struct uio *uio)
 {
 	struct thread *td = curthread;
 	struct iovec *iov;
@@ -183,7 +183,7 @@ uiomove(caddr_t cp, int n, struct uio *uio)
 		iov->iov_len -= cnt;
 		uio->uio_resid -= cnt;
 		uio->uio_offset += cnt;
-		cp += cnt;
+		cp = (char *)cp + cnt;
 		n -= cnt;
 	}
 out:
@@ -202,7 +202,7 @@ uiomove(caddr_t cp, int n, struct uio *uio)
  * Experimental support for zero-copy I/O
  */
 static int
-userspaceco(caddr_t cp, u_int cnt, struct uio *uio, struct vm_object *obj,
+userspaceco(void *cp, u_int cnt, struct uio *uio, struct vm_object *obj,
     int disposable)
 {
 	struct iovec *iov;
@@ -281,7 +281,7 @@ userspaceco(caddr_t cp, u_int cnt, struct uio *uio, struct vm_object *obj,
 }
 
 int
-uiomoveco(caddr_t cp, int n, struct uio *uio, struct vm_object *obj,
+uiomoveco(void *cp, int n, struct uio *uio, struct vm_object *obj,
     int disposable)
 {
 	struct iovec *iov;
@@ -329,7 +329,7 @@ uiomoveco(caddr_t cp, int n, struct uio *uio, struct vm_object *obj,
 		iov->iov_len -= cnt;
 		uio->uio_resid -= cnt;
 		uio->uio_offset += cnt;
-		cp += cnt;
+		cp = (char *)cp + cnt;
 		n -= cnt;
 	}
 	return (0);
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index 88575ac6fc07..860436023b7a 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -86,8 +86,8 @@ struct uio {
 struct vm_object;
 
 void	uio_yield(void);
-int	uiomove(caddr_t, int, struct uio *);
-int	uiomoveco(caddr_t, int, struct uio *, struct vm_object *, int);
+int	uiomove(void *, int, struct uio *);
+int	uiomoveco(void *, int, struct uio *, struct vm_object *, int);
 int	uioread(int, struct uio *, struct vm_object *, int *);
 int	copyinfrom(const void *src, void *dst, size_t len, int seg);
 int	copyinstrfrom(const void *src, void *dst, size_t len,