===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.73
retrieving revision 1.77
diff -u -p -r1.73 -r1.77
--- mandoc/mdoc_validate.c	2010/05/14 14:34:29	1.73
+++ mandoc/mdoc_validate.c	2010/05/14 17:54:26	1.77
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_validate.c,v 1.73 2010/05/14 14:34:29 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.77 2010/05/14 17:54:26 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -23,7 +23,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -45,8 +44,6 @@ struct	valids {
 };
 
 static	int	 check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);
-static	int	 check_msec(PRE_ARGS, ...);
-static	int	 check_sec(PRE_ARGS, ...);
 static	int	 check_stdarg(PRE_ARGS);
 static	int	 check_text(struct mdoc *, int, int, const char *);
 static	int	 check_argv(struct mdoc *, 
@@ -100,10 +97,7 @@ static	int	 pre_bl(PRE_ARGS);
 static	int	 pre_dd(PRE_ARGS);
 static	int	 pre_display(PRE_ARGS);
 static	int	 pre_dt(PRE_ARGS);
-static	int	 pre_ex(PRE_ARGS);
-static	int	 pre_fd(PRE_ARGS);
 static	int	 pre_it(PRE_ARGS);
-static	int	 pre_lb(PRE_ARGS);
 static	int	 pre_os(PRE_ARGS);
 static	int	 pre_rv(PRE_ARGS);
 static	int	 pre_sh(PRE_ARGS);
@@ -139,10 +133,10 @@ static	v_pre	 pres_d1[] = { pre_display, NULL };
 static	v_pre	 pres_dd[] = { pre_dd, NULL };
 static	v_pre	 pres_dt[] = { pre_dt, NULL };
 static	v_pre	 pres_er[] = { NULL, NULL };
-static	v_pre	 pres_ex[] = { pre_ex, NULL };
-static	v_pre	 pres_fd[] = { pre_fd, NULL };
+static	v_pre	 pres_ex[] = { NULL, NULL };
+static	v_pre	 pres_fd[] = { NULL, NULL };
 static	v_pre	 pres_it[] = { pre_it, NULL };
-static	v_pre	 pres_lb[] = { pre_lb, NULL };
+static	v_pre	 pres_lb[] = { NULL, NULL };
 static	v_pre	 pres_os[] = { pre_os, NULL };
 static	v_pre	 pres_rv[] = { pre_rv, NULL };
 static	v_pre	 pres_sh[] = { pre_sh, NULL };
@@ -416,52 +410,6 @@ check_stdarg(PRE_ARGS)
 
 
 static int
-check_sec(PRE_ARGS, ...)
-{
-	enum mdoc_sec	 sec;
-	va_list		 ap;
-
-	va_start(ap, n);
-
-	for (;;) {
-		/* LINTED */
-		sec = (enum mdoc_sec)va_arg(ap, int);
-		if (SEC_CUSTOM == sec)
-			break;
-		if (sec != mdoc->lastsec)
-			continue;
-		va_end(ap);
-		return(1);
-	}
-
-	va_end(ap);
-	return(mdoc_nwarn(mdoc, n, EBADSEC));
-}
-
-
-static int
-check_msec(PRE_ARGS, ...)
-{
-	va_list		 ap;
-	int		 msec;
-
-	va_start(ap, n);
-	for (;;) {
-		/* LINTED */
-		if (0 == (msec = va_arg(ap, int)))
-			break;
-		if (msec != mdoc->meta.msec)
-			continue;
-		va_end(ap);
-		return(1);
-	}
-
-	va_end(ap);
-	return(mdoc_nwarn(mdoc, n, EBADMSEC));
-}
-
-
-static int
 check_args(struct mdoc *m, const struct mdoc_node *n)
 {
 	int		 i;
@@ -762,14 +710,6 @@ pre_an(PRE_ARGS)
 
 
 static int
-pre_lb(PRE_ARGS)
-{
-
-	return(check_sec(mdoc, n, SEC_LIBRARY, SEC_CUSTOM));
-}
-
-
-static int
 pre_rv(PRE_ARGS)
 {
 
@@ -778,16 +718,6 @@ pre_rv(PRE_ARGS)
 
 
 static int
-pre_ex(PRE_ARGS)
-{
-
-	if ( ! check_msec(mdoc, n, 1, 6, 8, 0))
-		return(0);
-	return(check_stdarg(mdoc, n));
-}
-
-
-static int
 pre_dt(PRE_ARGS)
 {
 
@@ -921,7 +851,7 @@ post_at(POST_ARGS)
 		return(mdoc_nerr(mdoc, mdoc->last, EATT));
 	if (mdoc_a2att(mdoc->last->child->string))
 		return(1);
-	return(mdoc_nerr(mdoc, mdoc->last, EATT));
+	return(mdoc_nwarn(mdoc, mdoc->last, EATT));
 }
 
 
@@ -1162,7 +1092,7 @@ post_st(POST_ARGS)
 
 	if (mdoc_a2st(mdoc->last->child->string))
 		return(1);
-	return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND));
+	return(mdoc_nwarn(mdoc, mdoc->last, EBADSTAND));
 }
 
 
@@ -1329,12 +1259,4 @@ post_sh_head(POST_ARGS)
 	}
 
 	return(1);
-}
-
-
-static int
-pre_fd(PRE_ARGS)
-{
-
-	return(check_sec(mdoc, n, SEC_SYNOPSIS, SEC_CUSTOM));
 }