===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.116
retrieving revision 1.120
diff -u -p -r1.116 -r1.120
--- mandoc/man_validate.c	2015/04/02 23:48:19	1.116
+++ mandoc/man_validate.c	2015/10/12 00:08:15	1.120
@@ -1,4 +1,4 @@
-/*	$OpenBSD: man_validate.c,v 1.116 2015/04/02 23:48:19 schwarze Exp $ */
+/*	$OpenBSD: man_validate.c,v 1.120 2015/10/12 00:08:15 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -33,9 +33,10 @@
 #include "roff.h"
 #include "man.h"
 #include "libmandoc.h"
+#include "roff_int.h"
 #include "libman.h"
 
-#define	CHKARGS	  struct man *man, struct roff_node *n
+#define	CHKARGS	  struct roff_man *man, struct roff_node *n
 
 typedef	void	(*v_check)(CHKARGS);
 
@@ -98,7 +99,7 @@ static	v_check man_valids[MAN_MAX] = {
 
 
 void
-man_valid_post(struct man *man)
+man_valid_post(struct roff_man *man)
 {
 	struct roff_node *n;
 	v_check		*cp;
@@ -116,7 +117,6 @@ man_valid_post(struct man *man)
 		check_root(man, n);
 		break;
 	case ROFFT_EQN:
-		/* FALLTHROUGH */
 	case ROFFT_TBL:
 		break;
 	default:
@@ -206,17 +206,11 @@ post_ft(CHKARGS)
 	cp = n->child->string;
 	switch (*cp) {
 	case '1':
-		/* FALLTHROUGH */
 	case '2':
-		/* FALLTHROUGH */
 	case '3':
-		/* FALLTHROUGH */
 	case '4':
-		/* FALLTHROUGH */
 	case 'I':
-		/* FALLTHROUGH */
 	case 'P':
-		/* FALLTHROUGH */
 	case 'R':
 		if ('\0' == cp[1])
 			ok = 1;
@@ -256,7 +250,7 @@ check_par(CHKARGS)
 	switch (n->type) {
 	case ROFFT_BLOCK:
 		if (0 == n->body->nchild)
-			man_node_delete(man, n);
+			roff_node_delete(man, n);
 		break;
 	case ROFFT_BODY:
 		if (0 == n->nchild)
@@ -284,7 +278,7 @@ post_IP(CHKARGS)
 	switch (n->type) {
 	case ROFFT_BLOCK:
 		if (0 == n->head->nchild && 0 == n->body->nchild)
-			man_node_delete(man, n);
+			roff_node_delete(man, n);
 		break;
 	case ROFFT_BODY:
 		if (0 == n->parent->head->nchild && 0 == n->nchild)
@@ -388,7 +382,7 @@ post_TH(CHKARGS)
 	 * Remove the `TH' node after we've processed it for our
 	 * meta-data.
 	 */
-	man_node_delete(man, man->last);
+	roff_node_delete(man, man->last);
 }
 
 static void
@@ -498,18 +492,17 @@ post_vs(CHKARGS)
 
 	switch (n->parent->tok) {
 	case MAN_SH:
-		/* FALLTHROUGH */
 	case MAN_SS:
 		mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
 		    "%s after %s", man_macronames[n->tok],
 		    man_macronames[n->parent->tok]);
 		/* FALLTHROUGH */
-	case MAN_MAX:
+	case TOKEN_NONE:
 		/*
 		 * Don't warn about this because it occurs in pod2man
 		 * and would cause considerable (unfixable) warnage.
 		 */
-		man_node_delete(man, n);
+		roff_node_delete(man, n);
 		break;
 	default:
 		break;