===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.15
retrieving revision 1.17
diff -u -p -r1.15 -r1.17
--- mandoc/mdoc_validate.c	2009/06/17 14:10:09	1.15
+++ mandoc/mdoc_validate.c	2009/06/27 09:03:03	1.17
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.15 2009/06/17 14:10:09 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.17 2009/06/27 09:03:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -55,7 +55,6 @@ enum	mwarn {
 	WNOWIDTH,
 	WMISSWIDTH,
 	WESCAPE,
-	WDEPESC,
 	WDEPCOL,
 	WWRONGMSEC,
 	WSECOOO,
@@ -99,7 +98,6 @@ static	int	err_child_gt(struct mdoc *, const char *, i
 static	int	warn_child_gt(struct mdoc *, const char *, int);
 static	int	err_child_eq(struct mdoc *, const char *, int);
 static	int	warn_child_eq(struct mdoc *, const char *, int);
-static	int	count_child(struct mdoc *);
 static	int	warn_print(struct mdoc *, int, int);
 static	int	warn_count(struct mdoc *, const char *, 
 			int, const char *, int);
@@ -487,9 +485,6 @@ pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
 	case (WESCAPE):
 		p = "invalid escape sequence";
 		break;
-	case (WDEPESC):
-		p = "deprecated special-character escape";
-		break;
 	case (WNOLINE):
 		p = "suggested no line arguments";
 		break;
@@ -553,19 +548,6 @@ err_count(struct mdoc *m, const char *k,
 }
 
 
-static inline int
-count_child(struct mdoc *mdoc)
-{
-	int		  i;
-	struct mdoc_node *n;
-
-	for (i = 0, n = mdoc->last->child; n; n = n->next, i++)
-		/* Do nothing */ ;
-
-	return(i);
-}
-
-
 /*
  * Build these up with macros because they're basically the same check
  * for different inequalities.  Yes, this could be done with functions,
@@ -576,10 +558,9 @@ count_child(struct mdoc *mdoc)
 static int 							\
 lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz) 	\
 { 								\
-	int i; 							\
-	if ((i = count_child(mdoc)) ineq sz) 			\
+	if (mdoc->last->nchild ineq sz)				\
 		return(1); 					\
-	return(lvl##_count(mdoc, #ineq, sz, p, i)); 		\
+	return(lvl##_count(mdoc, #ineq, sz, p, mdoc->last->nchild)); \
 }
 
 #define CHECK_BODY_DEFN(name, lvl, func, num) 			\
@@ -743,10 +724,6 @@ check_text(struct mdoc *mdoc, int line, int pos, const
 
 		c = mdoc_isescape(p);
 		if (c) {
-			/* See if form is deprecated. */
-			if ('*' == p[1]) 
-				if ( ! pwarn(mdoc, line, pos, WDEPESC))
-					return(0);
 			p += (int)c - 1;
 			continue;
 		}