summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wright <jason@cvs.openbsd.org>2002-02-04 20:50:43 +0000
committerJason Wright <jason@cvs.openbsd.org>2002-02-04 20:50:43 +0000
commit53499e6cd12e64732f2efc509aaa917c3d80bc54 (patch)
treebc651c5af85b130874a10066347051c0ece65a1f
parentc06e458d7bd1894c2953d715e6bb9b32bcffde60 (diff)
Revision 1.37 was borked... This time, fix the casts and address the
void * arithmetic problem correctly in m_zero()
-rw-r--r--sys/kern/uipc_mbuf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 680edd62fc5..3683ddcc73f 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.49 2002/01/25 15:50:22 art Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.50 2002/02/04 20:50:42 jason Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -902,10 +902,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((caddr_t)m + sizeof(struct m_hdr) +
+ sizeof(struct pkthdr), 0, MHLEN);
else
- memset((void *)(m + sizeof(struct m_hdr)), 0, MLEN);
+ memset((caddr_t)m + sizeof(struct m_hdr), 0, MLEN);
if ((m->m_flags & M_EXT) &&
(m->m_ext.ext_free == NULL) &&
!MCLISREFERENCED(m))