===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.2
retrieving revision 1.8
diff -u -p -r1.2 -r1.8
--- mandoc/man_validate.c	2009/03/25 21:46:24	1.2
+++ mandoc/man_validate.c	2009/04/12 19:45:26	1.8
@@ -1,20 +1,18 @@
-/* $Id: man_validate.c,v 1.2 2009/03/25 21:46:24 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.8 2009/04/12 19:45:26 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/types.h>
 
@@ -35,7 +33,7 @@ struct	man_valid {
 	v_post	 *posts;
 };
 
-static	int	  count(POSTARGS);
+static	int	  count(const struct man_node *);
 static	int	  check_eq0(POSTARGS);
 static	int	  check_ge1(POSTARGS);
 static	int	  check_ge2(POSTARGS);
@@ -54,7 +52,7 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ posts_ge2_le5 }, /* TH */
 	{ posts_ge1 }, /* SH */
 	{ posts_ge1 }, /* SS */
-	{ posts_le1 }, /* TP */
+	{ NULL }, /* TP */
 	{ posts_eq0 }, /* LP */
 	{ posts_eq0 }, /* PP */
 	{ posts_eq0 }, /* P */
@@ -70,6 +68,10 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ NULL }, /* B */
 	{ NULL }, /* I */
 	{ NULL }, /* IR */
+	{ NULL }, /* RI */
+	{ posts_eq0 }, /* br */
+	{ posts_eq0 }, /* na */
+	{ NULL }, /* i */
 };
 
 
@@ -102,7 +104,7 @@ man_valid_post(struct man *m)
 
 
 static inline int
-count(POSTARGS)
+count(const struct man_node *n)
 { 
 	int		 i;
 
@@ -117,9 +119,9 @@ static int \
 check_##name(POSTARGS) \
 { \
 	int		 c; \
-	if ((c = count(m, n->child)) ineq (x)) \
+	if ((c = count(n->child)) ineq (x)) \
 		return(1); \
-	return(man_vwarn(m, n->line, n->pos, \
+	return(man_verr(m, n->line, n->pos, \
 			"expected line arguments %s %d, have %d", \
 			#ineq, (x), c)); \
 }