Module Name: src
Committed By: maxv
Date: Sat Dec 22 14:39:47 UTC 2018
Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9: Makefile mbuf.9
Log Message:
Update the man page, we don't want M_COPY_PKTHDR, M_MOVE_PKTHDR, MH_ALIGN
and M_ALIGN.
To generate a diff of this commit:
cvs rdiff -u -r1.2243 -r1.2244 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.432 -r1.433 src/share/man/man9/Makefile
cvs rdiff -u -r1.65 -r1.66 src/share/man/man9/mbuf.9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2243 src/distrib/sets/lists/comp/mi:1.2244
--- src/distrib/sets/lists/comp/mi:1.2243 Wed Dec 19 22:19:25 2018
+++ src/distrib/sets/lists/comp/mi Sat Dec 22 14:39:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2243 2018/12/19 22:19:25 christos Exp $
+# $NetBSD: mi,v 1.2244 2018/12/22 14:39:47 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -10452,11 +10452,11 @@
./usr/share/man/cat9/MFREE.0 comp-sys-catman .cat
./usr/share/man/cat9/MGET.0 comp-sys-catman .cat
./usr/share/man/cat9/MGETHDR.0 comp-sys-catman .cat
-./usr/share/man/cat9/MH_ALIGN.0 comp-sys-catman .cat
-./usr/share/man/cat9/M_ALIGN.0 comp-sys-catman .cat
-./usr/share/man/cat9/M_COPY_PKTHDR.0 comp-sys-catman .cat
+./usr/share/man/cat9/MH_ALIGN.0 comp-obsolete obsolete
+./usr/share/man/cat9/M_ALIGN.0 comp-obsolete obsolete
+./usr/share/man/cat9/M_COPY_PKTHDR.0 comp-obsolete obsolete
./usr/share/man/cat9/M_LEADINGSPACE.0 comp-sys-catman .cat
-./usr/share/man/cat9/M_MOVE_PKTHDR.0 comp-sys-catman .cat
+./usr/share/man/cat9/M_MOVE_PKTHDR.0 comp-obsolete obsolete
./usr/share/man/cat9/M_PREPEND.0 comp-sys-catman .cat
./usr/share/man/cat9/M_TRAILINGSPACE.0 comp-sys-catman .cat
./usr/share/man/cat9/NDINIT.0 comp-sys-catman .cat
@@ -18331,11 +18331,11 @@
./usr/share/man/html9/MFREE.html comp-sys-htmlman html
./usr/share/man/html9/MGET.html comp-sys-htmlman html
./usr/share/man/html9/MGETHDR.html comp-sys-htmlman html
-./usr/share/man/html9/MH_ALIGN.html comp-sys-htmlman html
-./usr/share/man/html9/M_ALIGN.html comp-sys-htmlman html
-./usr/share/man/html9/M_COPY_PKTHDR.html comp-sys-htmlman html
+./usr/share/man/html9/MH_ALIGN.html comp-obsolete obsolete
+./usr/share/man/html9/M_ALIGN.html comp-obsolete obsolete
+./usr/share/man/html9/M_COPY_PKTHDR.html comp-obsolete obsolete
./usr/share/man/html9/M_LEADINGSPACE.html comp-sys-htmlman html
-./usr/share/man/html9/M_MOVE_PKTHDR.html comp-sys-htmlman html
+./usr/share/man/html9/M_MOVE_PKTHDR.html comp-obsolete obsolete
./usr/share/man/html9/M_PREPEND.html comp-sys-htmlman html
./usr/share/man/html9/M_TRAILINGSPACE.html comp-sys-htmlman html
./usr/share/man/html9/NDINIT.html comp-sys-htmlman html
@@ -26292,11 +26292,11 @@
./usr/share/man/man9/MFREE.9 comp-sys-man .man
./usr/share/man/man9/MGET.9 comp-sys-man .man
./usr/share/man/man9/MGETHDR.9 comp-sys-man .man
-./usr/share/man/man9/MH_ALIGN.9 comp-sys-man .man
-./usr/share/man/man9/M_ALIGN.9 comp-sys-man .man
-./usr/share/man/man9/M_COPY_PKTHDR.9 comp-sys-man .man
+./usr/share/man/man9/MH_ALIGN.9 comp-obsolete obsolete
+./usr/share/man/man9/M_ALIGN.9 comp-obsolete obsolete
+./usr/share/man/man9/M_COPY_PKTHDR.9 comp-obsolete obsolete
./usr/share/man/man9/M_LEADINGSPACE.9 comp-sys-man .man
-./usr/share/man/man9/M_MOVE_PKTHDR.9 comp-sys-man .man
+./usr/share/man/man9/M_MOVE_PKTHDR.9 comp-obsolete obsolete
./usr/share/man/man9/M_PREPEND.9 comp-sys-man .man
./usr/share/man/man9/M_TRAILINGSPACE.9 comp-sys-man .man
./usr/share/man/man9/NDINIT.9 comp-sys-man .man
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.432 src/share/man/man9/Makefile:1.433
--- src/share/man/man9/Makefile:1.432 Thu Nov 15 10:06:06 2018
+++ src/share/man/man9/Makefile Sat Dec 22 14:39:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.432 2018/11/15 10:06:06 maxv Exp $
+# $NetBSD: Makefile,v 1.433 2018/12/22 14:39:46 maxv Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -497,9 +497,8 @@ MLINKS+=mbuf.9 m_get.9 mbuf.9 m_gethdr.9
mbuf.9 m_split.9 mbuf.9 m_adj.9 mbuf.9 m_free.9 \
mbuf.9 m_freem.9 mbuf.9 mtod.9 mbuf.9 mtocl.9 mbuf.9 cltom.9 \
mbuf.9 MGET.9 mbuf.9 MGETHDR.9 mbuf.9 MEXTMALLOC.9 \
- mbuf.9 MEXTADD.9 mbuf.9 MCLGET.9 mbuf.9 M_COPY_PKTHDR.9 \
- mbuf.9 M_MOVE_PKTHDR.9 \
- mbuf.9 M_ALIGN.9 mbuf.9 MH_ALIGN.9 mbuf.9 M_LEADINGSPACE.9 \
+ mbuf.9 MEXTADD.9 mbuf.9 MCLGET.9 \
+ mbuf.9 M_LEADINGSPACE.9 \
mbuf.9 M_TRAILINGSPACE.9 mbuf.9 M_PREPEND.9 mbuf.9 MCHTYPE.9 \
mbuf.9 MFREE.9
MLINKS+=mca.9 mca_intr_establish.9 \
Index: src/share/man/man9/mbuf.9
diff -u src/share/man/man9/mbuf.9:1.65 src/share/man/man9/mbuf.9:1.66
--- src/share/man/man9/mbuf.9:1.65 Thu Nov 15 10:56:29 2018
+++ src/share/man/man9/mbuf.9 Sat Dec 22 14:39:46 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbuf.9,v 1.65 2018/11/15 10:56:29 maxv Exp $
+.\" $NetBSD: mbuf.9,v 1.66 2018/12/22 14:39:46 maxv Exp $
.\"
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 7, 2018
+.Dd December 22, 2018
.Dt MBUF 9
.Os
.Sh NAME
@@ -57,11 +57,10 @@
.Nm MEXTMALLOC ,
.Nm MEXTADD ,
.Nm MCLGET ,
-.Nm M_COPY_PKTHDR ,
-.Nm M_MOVE_PKTHDR ,
+.Nm m_copy_pkthdr ,
+.Nm m_move_pkthdr ,
.Nm m_remove_pkthdr ,
-.Nm M_ALIGN ,
-.Nm MH_ALIGN ,
+.Nm m_align ,
.Nm M_LEADINGSPACE ,
.Nm M_TRAILINGSPACE ,
.Nm M_PREPEND ,
@@ -120,15 +119,13 @@
.Ft void
.Fn MCLGET "struct mbuf *m" "int how"
.Ft void
-.Fn M_COPY_PKTHDR "struct mbuf *to" "struct mbuf *from"
+.Fn m_copy_pkthdr "struct mbuf *to" "struct mbuf *from"
.Ft void
-.Fn M_MOVE_PKTHDR "struct mbuf *to" "struct mbuf *from"
+.Fn m_move_pkthdr "struct mbuf *to" "struct mbuf *from"
.Ft void
.Fn m_remove_pkthdr "struct mbuf *m"
.Ft void
-.Fn M_ALIGN "struct mbuf *m" "int len"
-.Ft void
-.Fn MH_ALIGN "struct mbuf *m" "int len"
+.Fn m_align "struct mbuf *m" "int len"
.Ft int
.Fn M_LEADINGSPACE "struct mbuf *m"
.Ft int
@@ -606,7 +603,7 @@ from caller.
The flag
.Dv M_EXT
is set upon success.
-.It Fn M_COPY_PKTHDR "struct mbuf *to" "struct mbuf *from"
+.It Fn m_copy_pkthdr "struct mbuf *to" "struct mbuf *from"
Copies the mbuf pkthdr from mbuf
.Fa from
to mbuf
@@ -617,7 +614,7 @@ must have the type flag
set, and
.Fa to
must be empty.
-.It Fn M_MOVE_PKTHDR "struct mbuf *to" "struct mbuf *from"
+.It Fn m_move_pkthdr "struct mbuf *to" "struct mbuf *from"
Moves the mbuf pkthdr from mbuf
.Fa from
to mbuf
@@ -641,7 +638,7 @@ must have the flag
.Dv M_PKTHDR
set.
This flag will be cleared.
-.It Fn M_ALIGN "struct mbuf *m" "int len"
+.It Fn m_align "struct mbuf *m" "int len"
Sets the data pointer of a newly allocated mbuf
.Fa m
to
@@ -651,16 +648,6 @@ bytes from the end of the mbuf data area
bytes of data written to the mbuf
.Fa m ,
starting at the data pointer, will be aligned to the end of the data area.
-.It Fn MH_ALIGN "struct mbuf *m" "int len"
-Sets the data pointer of a newly allocated packetheader mbuf
-.Fa m
-to
-.Fa len
-bytes from the end of the mbuf data area, so that
-.Fa len
-bytes of data written to the mbuf
-.Fa m ,
-starting at the data pointer, will be aligned to the end of the data area.
.It Fn M_LEADINGSPACE "struct mbuf *m"
Returns the amount of space available before the current start of valid
data in mbuf
