summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2012-09-27 16:15:01 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2012-09-27 16:15:01 +0000
commit7f5180ef5dc4fccd1b734f28895d3fb30bf40f8c (patch)
tree6611df49e84b4e1f80059c0ee9d3283a8c350f71 /share
parent377e769f61f5002a44b95a542ff807ea5b9c8a21 (diff)
replace m_zero(9) with M_ZEROIZE; original diff from markus
ok mikeb markus
Diffstat (limited to 'share')
-rw-r--r--share/man/man9/Makefile4
-rw-r--r--share/man/man9/mbuf.912
2 files changed, 7 insertions, 9 deletions
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 12f6dc30932..ba413cd7987 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.172 2012/09/17 05:50:53 jmc Exp $
+# $OpenBSD: Makefile,v 1.173 2012/09/27 16:15:00 jmc Exp $
# $NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -207,7 +207,7 @@ MLINKS+=mbuf.9 m_copym2.9 mbuf.9 m_copym.9 mbuf.9 m_free.9 mbuf.9 MFREE.9 \
mbuf.9 m_split.9 \
mbuf.9 m_inject.9 mbuf.9 m_getptr.9 mbuf.9 m_adj.9 mbuf.9 m_copyback.9 \
mbuf.9 m_freem.9 mbuf.9 m_reclaim.9 mbuf.9 m_copydata.9 \
- mbuf.9 m_cat.9 mbuf.9 m_devget.9 mbuf.9 m_zero.9 mbuf.9 m_apply.9 \
+ mbuf.9 m_cat.9 mbuf.9 m_devget.9 mbuf.9 m_apply.9 \
mbuf.9 MCLGET.9 mbuf.9 MCLGETI.9 \
mbuf.9 MEXTADD.9 mbuf.9 M_ALIGN.9 mbuf.9 MH_ALIGN.9 \
mbuf.9 M_READONLY.9 mbuf.9 M_LEADINGSPACE.9 \
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 5be81fe04a3..b9974b3224a 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbuf.9,v 1.56 2011/12/02 10:57:16 dlg Exp $
+.\" $OpenBSD: mbuf.9,v 1.57 2012/09/27 16:15:00 jmc Exp $
.\"
.\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jjbg@openbsd.org>
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: December 2 2011 $
+.Dd $Mdocdate: September 27 2012 $
.Dt MBUF 9
.Os
.Sh NAME
@@ -76,8 +76,6 @@
.Ft struct mbuf *
.Fn m_devget "char *buf" "int totlen" "int off" "struct ifnet *ifp" \
"void (*func)(const void *, void *, size_t)"
-.Ft void
-.Fn m_zero "struct mbuf *m"
.Ft int
.Fn m_apply "struct mbuf *m" "int off" "int len" \
"int (*func)(caddr_t, caddr_t, unsigned int)" "caddr_t fstate"
@@ -248,6 +246,9 @@ packet was encrypted (ESP-transport).
packet was authenticated (AH or ESP).
.It Dv M_AUTH_AH
header was authenticated (AH).
+.It Dv M_ZEROIZE
+Zero the data part of the mbufs in the mbuf chain pointed to by
+.Nm m_free .
.It Dv M_TUNNEL
header was IP-in-IP encapsulated by tunnel mode IPsec.
.It Dv M_LINK0
@@ -577,9 +578,6 @@ The data is copied into an mbuf chain at offset
.Fa off
and a pointer to the head of the chain is returned.
Returns NULL on failure.
-.It Fn m_zero "struct mbuf *m"
-Zeroize the data part of the mbufs in the mbuf chain pointed to by
-.Fa m .
.It Fn m_apply "struct mbuf *m" "int off" "int len" \
"int (*func)(caddr_t, caddr_t, unsigned int)" "caddr_t fstate"
Apply the function