diff options
author | dillon <dillon@FreeBSD.org> | 2002-02-05 02:00:56 +0000 |
---|---|---|
committer | dillon <dillon@FreeBSD.org> | 2002-02-05 02:00:56 +0000 |
commit | b3ddc72561f16866b59e6109d6803494f0d06caa (patch) | |
tree | ddce9732dedf55dfc29f00f3efed3b0ce5e9788e /sys/kern | |
parent | 0511c3ea5ba32c8d8794bbaecfb500020b2d7f0f (diff) | |
download | FreeBSD-src-b3ddc72561f16866b59e6109d6803494f0d06caa.zip FreeBSD-src-b3ddc72561f16866b59e6109d6803494f0d06caa.tar.gz |
Get rid of the twisted MFREE() macro entirely.
Reviewed by: dg, bmilekic
MFC after: 3 days
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/uipc_mbuf.c | 11 | ||||
-rw-r--r-- | sys/kern/uipc_sockbuf.c | 13 | ||||
-rw-r--r-- | sys/kern/uipc_socket.c | 4 | ||||
-rw-r--r-- | sys/kern/uipc_socket2.c | 13 |
4 files changed, 15 insertions, 26 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 015634d..b420f74 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -131,14 +131,9 @@ failed: void m_freem(struct mbuf *m) { - struct mbuf *n; - - if (m == NULL) - return; - do { - MFREE(m, n); - m = n; - } while (m); + while (m) { + m = m_free(m); + } } /* diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index dc1f4cb..40907f9 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -777,7 +777,7 @@ sbdrop(sb, len) register struct sockbuf *sb; register int len; { - register struct mbuf *m, *mn; + register struct mbuf *m; struct mbuf *next; next = (m = sb->sb_mb) ? m->m_nextpkt : 0; @@ -797,13 +797,11 @@ sbdrop(sb, len) } len -= m->m_len; sbfree(sb, m); - MFREE(m, mn); - m = mn; + m = m_free(m); } while (m && m->m_len == 0) { sbfree(sb, m); - MFREE(m, mn); - m = mn; + m = m_free(m); } if (m) { sb->sb_mb = m; @@ -820,15 +818,14 @@ void sbdroprecord(sb) register struct sockbuf *sb; { - register struct mbuf *m, *mn; + register struct mbuf *m; m = sb->sb_mb; if (m) { sb->sb_mb = m->m_nextpkt; do { sbfree(sb, m); - MFREE(m, mn); - m = mn; + m = m_free(m); } while (m); } } diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index d81a97d..68e15f7 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -809,7 +809,7 @@ dontblock: m = m->m_next; } else { sbfree(&so->so_rcv, m); - MFREE(m, so->so_rcv.sb_mb); + so->so_rcv.sb_mb = m_free(m); m = so->so_rcv.sb_mb; } } @@ -893,7 +893,7 @@ dontblock: so->so_rcv.sb_mb = m = m->m_next; *mp = (struct mbuf *)0; } else { - MFREE(m, so->so_rcv.sb_mb); + so->so_rcv.sb_mb = m_free(m); m = so->so_rcv.sb_mb; } if (m) diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index dc1f4cb..40907f9 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -777,7 +777,7 @@ sbdrop(sb, len) register struct sockbuf *sb; register int len; { - register struct mbuf *m, *mn; + register struct mbuf *m; struct mbuf *next; next = (m = sb->sb_mb) ? m->m_nextpkt : 0; @@ -797,13 +797,11 @@ sbdrop(sb, len) } len -= m->m_len; sbfree(sb, m); - MFREE(m, mn); - m = mn; + m = m_free(m); } while (m && m->m_len == 0) { sbfree(sb, m); - MFREE(m, mn); - m = mn; + m = m_free(m); } if (m) { sb->sb_mb = m; @@ -820,15 +818,14 @@ void sbdroprecord(sb) register struct sockbuf *sb; { - register struct mbuf *m, *mn; + register struct mbuf *m; m = sb->sb_mb; if (m) { sb->sb_mb = m->m_nextpkt; do { sbfree(sb, m); - MFREE(m, mn); - m = mn; + m = m_free(m); } while (m); } } |