Module Name: src
Committed By: christos
Date: Sat Sep 26 03:32:17 UTC 2015
Modified Files:
src/external/cddl/osnet/sys/sys: uio.h
Log Message:
avoid compiler warnings
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/sys/sys/uio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/uio.h
diff -u src/external/cddl/osnet/sys/sys/uio.h:1.8 src/external/cddl/osnet/sys/sys/uio.h:1.9
--- src/external/cddl/osnet/sys/sys/uio.h:1.8 Tue Apr 21 09:15:28 2015
+++ src/external/cddl/osnet/sys/sys/uio.h Fri Sep 25 23:32:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uio.h,v 1.8 2015/04/21 13:15:28 riastradh Exp $ */
+/* $NetBSD: uio.h,v 1.9 2015/09/26 03:32:17 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -127,18 +127,18 @@ zfs_uiocopy(void *cp, size_t n, enum uio
static __inline void
zfs_uioskip(uio_t *uiop, size_t n)
{
- if (n > uiop->uio_resid)
+ if (n > (size_t)uiop->uio_resid)
return;
while (n != 0) {
- register iovec_t *iovp = uiop->uio_iov;
- register size_t niovb = MIN(iovp->iov_len, n);
+ iovec_t *iovp = uiop->uio_iov;
+ size_t niovb = MIN(iovp->iov_len, n);
if (niovb == 0) {
uiop->uio_iov++;
uiop->uio_iovcnt--;
continue;
}
- iovp->iov_base += niovb;
+ iovp->iov_base = (char *)iovp->iov_base + niovb;
uiop->uio_offset += niovb;
iovp->iov_len -= niovb;
uiop->uio_resid -= niovb;
