diff options
| author |   aaron <aaron@openbsd.org> | 2001-06-26 06:27:38 +0000 |
|---|---|---|
| committer | aaron <aaron@openbsd.org> | 2001-06-26 06:27:38 +0000 |
| commit | 7cdefcf6a836a88af1352f075c91f37bf0fbab63 (patch) | |
| tree | ee0b05819682357d794274db234d82951d997666 /sys | |
| parent | KNF (diff) | |
| download | wireguard-openbsd-7cdefcf6a836a88af1352f075c91f37bf0fbab63.tar.xz wireguard-openbsd-7cdefcf6a836a88af1352f075c91f37bf0fbab63.zip | |
Appease gcc by not using void pointers in arithmetic operations; art@ ok
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_ktrace.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_physio.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_subr.c | 6 | ||||
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 4f66006f430..55788dd59a7 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ktrace.c,v 1.23 2001/06/22 14:14:08 deraadt Exp $ */ +/* $OpenBSD: kern_ktrace.c,v 1.24 2001/06/26 06:27:38 aaron Exp $ */ /* $NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $ */ /* @@ -230,7 +230,7 @@ ktrgenio(p, fd, rw, iov, len, error) break; iov->iov_len -= count; - iov->iov_base += count; + iov->iov_base = (caddr_t)iov->iov_base + count; if (iov->iov_len == 0) iov++; @@ -535,4 +535,4 @@ ktrcanset(callp, targetp) return (0); } -#endif
\ No newline at end of file +#endif diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index ba99b55d2a2..9d891a757b3 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_physio.c,v 1.11 2001/06/22 14:14:09 deraadt Exp $ */ +/* $OpenBSD: kern_physio.c,v 1.12 2001/06/26 06:27:39 aaron Exp $ */ /* $NetBSD: kern_physio.c,v 1.28 1997/05/19 10:43:28 pk Exp $ */ /*- @@ -249,7 +249,7 @@ after_unlock: panic("done > todo; strategy broken"); #endif iovp->iov_len -= done; - iovp->iov_base += done; + iovp->iov_base = (caddr_t)iovp->iov_base + done; uio->uio_offset += done; uio->uio_resid -= done; diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 4fd1742f18f..5aa0de85615 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_subr.c,v 1.17 2001/06/23 05:45:13 art Exp $ */ +/* $OpenBSD: kern_subr.c,v 1.18 2001/06/26 06:27:40 aaron Exp $ */ /* $NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $ */ /* @@ -107,7 +107,7 @@ uiomove(cp, n, uio) break; #endif } - iov->iov_base += cnt; + iov->iov_base = (caddr_t)iov->iov_base + cnt; iov->iov_len -= cnt; uio->uio_resid -= cnt; uio->uio_offset += cnt; @@ -157,7 +157,7 @@ again: *(char *)iov->iov_base = c; break; } - iov->iov_base++; + iov->iov_base = (caddr_t)iov->iov_base + 1; iov->iov_len--; uio->uio_resid--; uio->uio_offset++; diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 20fb437b057..a48b1a4edfa 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.36 2001/06/25 02:52:18 angelos Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.37 2001/06/26 06:27:40 aaron Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -936,10 +936,10 @@ m_zero(m) { while (m) { if (m->m_flags & M_PKTHDR) - memset((void *)m + sizeof(struct m_hdr) + - sizeof(struct pkthdr), 0, MHLEN); + memset((void *)(m + sizeof(struct m_hdr) + + sizeof(struct pkthdr)), 0, MHLEN); else - memset((void *)m + sizeof(struct m_hdr), 0, MLEN); + memset((void *)(m + sizeof(struct m_hdr)), 0, MLEN); if ((m->m_flags & M_EXT) && (m->m_ext.ext_free == NULL) && !MCLISREFERENCED(m)) |