Date: Mon, 4 Aug 2014 13:11:38 GMT From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271849 - soc2014/dpl/netmap-ipfwjit/extra/sys/sys Message-ID: <201408041311.s74DBcjx016136@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dpl Date: Mon Aug 4 13:11:37 2014 New Revision: 271849 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271849 Log: Changed void pointer's type using cast to avoid C++ errors Modified: soc2014/dpl/netmap-ipfwjit/extra/sys/sys/mbuf.h Modified: soc2014/dpl/netmap-ipfwjit/extra/sys/sys/mbuf.h ============================================================================== --- soc2014/dpl/netmap-ipfwjit/extra/sys/sys/mbuf.h Mon Aug 4 13:11:06 2014 (r271848) +++ soc2014/dpl/netmap-ipfwjit/extra/sys/sys/mbuf.h Mon Aug 4 13:11:37 2014 (r271849) @@ -178,7 +178,7 @@ tags_freelist_count--; } else { ND("size %d allocate from malloc", l); - m = malloc(l, 0, M_NOWAIT); + m = (struct m_tag *)malloc(l, 0, M_NOWAIT); } if (m) { bzero(m, l); @@ -269,13 +269,13 @@ { struct mbuf *m; static const struct mbuf m0; /* zero-initialized */ - + if (mbuf_freelist) { m = mbuf_freelist; mbuf_freelist = m->m_next; *m = m0; } else { - m = malloc(MY_MCLBYTES, M_IPFW, M_NOWAIT); + m = (struct mbuf *)malloc(MY_MCLBYTES, M_IPFW, M_NOWAIT); } ND("new mbuf %p", m); @@ -308,11 +308,10 @@ if (req_len < 0 || req_len > mp->m_len) { D("no m_adj for len %d in mlen %d", req_len, mp->m_len); } else { - mp->m_data += req_len; + (char*)mp->m_data += req_len; mp->m_len += req_len; } -} - +} #define M_PREPEND_GOOD(m, plen, how) do { \ struct mbuf **_mmp = &(m); \ struct mbuf *_mm = *_mmp; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408041311.s74DBcjx016136>