Module Name: src
Committed By: jym
Date: Tue Sep 27 00:36:51 UTC 2011
Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9: KASSERT.9 Makefile
Log Message:
Document new *ASSERTMSG() prototype, and update KASSERT(9).
See also
http://mail-index.netbsd.org/tech-kern/2011/09/07/msg011427.html
To generate a diff of this commit:
cvs rdiff -u -r1.1679 -r1.1680 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/KASSERT.9
cvs rdiff -u -r1.349 -r1.350 src/share/man/man9/Makefile
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.1679 src/distrib/sets/lists/comp/mi:1.1680
--- src/distrib/sets/lists/comp/mi:1.1679 Sun Sep 25 04:11:47 2011
+++ src/distrib/sets/lists/comp/mi Tue Sep 27 00:36:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1679 2011/09/25 04:11:47 christos Exp $
+# $NetBSD: mi,v 1.1680 2011/09/27 00:36:49 jym Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9410,6 +9410,7 @@
./usr/share/man/cat9/KASSERT.0 comp-sys-catman .cat
./usr/share/man/cat9/KASSERTMSG.0 comp-sys-catman .cat
./usr/share/man/cat9/KDASSERT.0 comp-sys-catman .cat
+./usr/share/man/cat9/KDASSERTMSG.0 comp-sys-catman .cat
./usr/share/man/cat9/KNOTE.0 comp-sys-catman .cat
./usr/share/man/cat9/LWP_CACHE_CREDS.0 comp-sys-catman .cat
./usr/share/man/cat9/MALLOC.0 comp-sys-catman .cat
@@ -15503,6 +15504,7 @@
./usr/share/man/html9/KASSERT.html comp-sys-htmlman html
./usr/share/man/html9/KASSERTMSG.html comp-sys-htmlman html
./usr/share/man/html9/KDASSERT.html comp-sys-htmlman html
+./usr/share/man/html9/KDASSERTMSG.html comp-sys-htmlman html
./usr/share/man/html9/KNOTE.html comp-sys-htmlman html
./usr/share/man/html9/LWP_CACHE_CREDS.html comp-sys-htmlman html
./usr/share/man/html9/MALLOC.html comp-sys-htmlman html
@@ -21681,6 +21683,7 @@
./usr/share/man/man9/KASSERT.9 comp-sys-man .man
./usr/share/man/man9/KASSERTMSG.9 comp-sys-man .man
./usr/share/man/man9/KDASSERT.9 comp-sys-man .man
+./usr/share/man/man9/KDASSERTMSG.9 comp-sys-man .man
./usr/share/man/man9/KNOTE.9 comp-sys-man .man
./usr/share/man/man9/LWP_CACHE_CREDS.9 comp-sys-man .man
./usr/share/man/man9/MALLOC.9 comp-sys-man .man
Index: src/share/man/man9/KASSERT.9
diff -u src/share/man/man9/KASSERT.9:1.12 src/share/man/man9/KASSERT.9:1.13
--- src/share/man/man9/KASSERT.9:1.12 Wed Apr 6 05:40:19 2011
+++ src/share/man/man9/KASSERT.9 Tue Sep 27 00:36:51 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: KASSERT.9,v 1.12 2011/04/06 05:40:19 jruoho Exp $
+.\" $NetBSD: KASSERT.9,v 1.13 2011/09/27 00:36:51 jym Exp $
.\"
.\" Copyright (c) 2006 Igor Sobrado
.\" All rights reserved.
@@ -24,21 +24,24 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 6, 2011
+.Dd September 27, 2011
.Dt KASSERT 9
.Os
.Sh NAME
.Nm KASSERT ,
.Nm KASSERTMSG ,
-.Nm KDASSERT
+.Nm KDASSERT ,
+.Nm KDASSERTMSG
.Nd kernel expression verification macros
.Sh SYNOPSIS
.Ft void
.Fn KASSERT expression
.Ft void
-.Fn KASSERTMSG expression message
+.Fn KASSERTMSG expression format ...
.Ft void
.Fn KDASSERT expression
+.Ft void
+.Fn KDASSERTMSG expression format ...
.Sh DESCRIPTION
These machine independent assertion-checking macros cause a kernel
.Xr panic 9
@@ -62,6 +65,8 @@ the macros are defined to be no-ops.
.It
The
.Fn KDASSERT
+and
+.Fn KDASSERTMSG
tests are included only in kernels compiled with the
.Dv DEBUG
configuration option.
@@ -91,11 +96,16 @@ vs. diagnostic), the expression that fai
number the failure happened on.
The
.Fn KASSERTMSG
-macro appends additional
-.Fa message
+and
+.Fn KDASSERTMSG
+macros append
to the
.Xr panic 9
-format string.
+format string the message specified by
+.Fa format
+and its subsequent arguments, similar to
+.Xr printf 9
+functions.
.Sh SEE ALSO
.Xr config 1 ,
.Xr options 4 ,
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.349 src/share/man/man9/Makefile:1.350
--- src/share/man/man9/Makefile:1.349 Sat Jul 30 18:19:05 2011
+++ src/share/man/man9/Makefile Tue Sep 27 00:36:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.349 2011/07/30 18:19:05 rmind Exp $
+# $NetBSD: Makefile,v 1.350 2011/09/27 00:36:51 jym Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -81,7 +81,8 @@ MLINKS+=dmover.9 dmover_backend_register
MAN+= CTASSERT.9
MAN+= KASSERT.9
MLINKS+=KASSERT.9 KASSERTMSG.9 \
- KASSERT.9 KDASSERT.9
+ KASSERT.9 KDASSERT.9 \
+ KASSERT.9 KDASSERTMSG.9
MLINKS+=accept_filter.9 accept_filt_add.9
MLINKS+=accept_filter.9 accept_filt_del.9
