summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_subr.c
diff options
context:
space:
mode:
authormike <mike@FreeBSD.org>2002-10-11 14:58:34 +0000
committermike <mike@FreeBSD.org>2002-10-11 14:58:34 +0000
commit8630abe45fe3751d8cc345f537ad98962a59ef5e (patch)
tree60ccb9ea10edcf3d8fc8975fb348b756ea207e35 /sys/kern/kern_subr.c
parentb3c0f70717dc721a9076491fe80fef2e28c95424 (diff)
downloadFreeBSD-src-8630abe45fe3751d8cc345f537ad98962a59ef5e.zip
FreeBSD-src-8630abe45fe3751d8cc345f537ad98962a59ef5e.tar.gz
Change iov_base's type from `char *' to the standard `void *'. All
uses of iov_base which assume its type is `char *' (in order to do pointer arithmetic) have been updated to cast iov_base to `char *'.
Diffstat (limited to 'sys/kern/kern_subr.c')
-rw-r--r--sys/kern/kern_subr.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index ee38f2d..1a44b85 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -192,7 +192,7 @@ uiomove(cp, n, uio)
case UIO_NOCOPY:
break;
}
- iov->iov_base += cnt;
+ iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
uio->uio_offset += cnt;
@@ -346,7 +346,7 @@ uiomoveco(cp, n, uio, obj, disposable)
case UIO_NOCOPY:
break;
}
- iov->iov_base += cnt;
+ iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
uio->uio_offset += cnt;
@@ -415,7 +415,7 @@ uioread(n, uio, obj, nread)
if (error)
break;
- iov->iov_base += cnt;
+ iov->iov_base = (char *)iov->iov_base + cnt;
iov->iov_len -= cnt;
uio->uio_resid -= cnt;
uio->uio_offset += cnt;
@@ -438,6 +438,7 @@ ureadc(c, uio)
register struct uio *uio;
{
register struct iovec *iov;
+ register char *iov_base;
again:
if (uio->uio_iovcnt == 0 || uio->uio_resid == 0)
@@ -456,13 +457,15 @@ again:
break;
case UIO_SYSSPACE:
- *iov->iov_base = c;
+ iov_base = iov->iov_base;
+ *iov_base = c;
+ iov->iov_base = iov_base;
break;
case UIO_NOCOPY:
break;
}
- iov->iov_base++;
+ iov->iov_base = (char *)iov->iov_base + 1;
iov->iov_len--;
uio->uio_resid--;
uio->uio_offset++;
OpenPOWER on IntegriCloud