Author: avos
Date: Sat Oct 15 07:28:46 2016
New Revision: 307340
URL: https://svnweb.freebsd.org/changeset/base/307340
Log:
MFC r307000, r307001:
mbuf(9), mbuf_tags(9): fix function prototypes.
- Add m_getclr(9) symlink to ObsoleteFiles.inc (removed in r295481).
- Add const qualifiers in m_dup(), m_dup_pkthdr() and m_tag_copy_chain()
(r286450).
- Fix m_dup_pkthdr() definition (it's not the same as m_move_pkthdr()).
Modified:
stable/11/ObsoleteFiles.inc
stable/11/share/man/man9/Makefile
stable/11/share/man/man9/mbuf.9
stable/11/share/man/man9/mbuf_tags.9
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/ObsoleteFiles.inc
==============================================================================
--- stable/11/ObsoleteFiles.inc Sat Oct 15 06:16:35 2016 (r307339)
+++ stable/11/ObsoleteFiles.inc Sat Oct 15 07:28:46 2016 (r307340)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20161015: remove link to removed m_getclr(9) macro
+OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
# 20160703: POSIXify locales with variants
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE
Modified: stable/11/share/man/man9/Makefile
==============================================================================
--- stable/11/share/man/man9/Makefile Sat Oct 15 06:16:35 2016
(r307339)
+++ stable/11/share/man/man9/Makefile Sat Oct 15 07:28:46 2016
(r307340)
@@ -1089,7 +1089,6 @@ MLINKS+=\
mbuf.9 m_get2.9 \
mbuf.9 m_getjcl.9 \
mbuf.9 m_getcl.9 \
- mbuf.9 m_getclr.9 \
mbuf.9 MGETHDR.9 \
mbuf.9 m_gethdr.9 \
mbuf.9 m_getm.9 \
Modified: stable/11/share/man/man9/mbuf.9
==============================================================================
--- stable/11/share/man/man9/mbuf.9 Sat Oct 15 06:16:35 2016
(r307339)
+++ stable/11/share/man/man9/mbuf.9 Sat Oct 15 07:28:46 2016
(r307340)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 29, 2016
+.Dd October 10, 2016
.Dt MBUF 9
.Os
.\"
@@ -79,8 +79,6 @@
.Ft struct mbuf *
.Fn m_getcl "int how" "short type" "int flags"
.Ft struct mbuf *
-.Fn m_getclr "int how" "short type"
-.Ft struct mbuf *
.Fn m_gethdr "int how" "short type"
.Ft struct mbuf *
.Fn m_free "struct mbuf *mbuf"
@@ -107,7 +105,7 @@
.Ft struct mbuf *
.Fn m_copypacket "struct mbuf *mbuf" "int how"
.Ft struct mbuf *
-.Fn m_dup "struct mbuf *mbuf" "int how"
+.Fn m_dup "const struct mbuf *mbuf" "int how"
.Ft void
.Fn m_copydata "const struct mbuf *mbuf" "int offset" "int len" "caddr_t buf"
.Ft void
@@ -126,8 +124,8 @@
.Fn m_catpkt "struct mbuf *m" "struct mbuf *n"
.Ft u_int
.Fn m_fixhdr "struct mbuf *mbuf"
-.Ft void
-.Fn m_dup_pkthdr "struct mbuf *to" "struct mbuf *from"
+.Ft int
+.Fn m_dup_pkthdr "struct mbuf *to" "const struct mbuf *from" "int how"
.Ft void
.Fn m_move_pkthdr "struct mbuf *to" "struct mbuf *from"
.Ft u_int
@@ -602,10 +600,6 @@ This is like
but it the size of the cluster allocated will be large enough for
.Fa size
bytes.
-.It Fn m_getclr how type
-Allocate an
-.Vt mbuf
-and zero out the data region.
.It Fn m_free mbuf
Frees
.Vt mbuf .
Modified: stable/11/share/man/man9/mbuf_tags.9
==============================================================================
--- stable/11/share/man/man9/mbuf_tags.9 Sat Oct 15 06:16:35 2016
(r307339)
+++ stable/11/share/man/man9/mbuf_tags.9 Sat Oct 15 07:28:46 2016
(r307340)
@@ -33,7 +33,7 @@
.Ft "struct m_tag *"
.Fn m_tag_copy "struct m_tag *t" "int how"
.Ft int
-.Fn m_tag_copy_chain "struct mbuf *to" "struct mbuf *from" "int how"
+.Fn m_tag_copy_chain "struct mbuf *to" "const struct mbuf *from" "int how"
.Ft void
.Fn m_tag_delete "struct mbuf *m" "struct m_tag *t"
.Ft void
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
