Profit from the unified struct roff_man and reduce the number of

arguments of mparse_result() by one.  No functional change.
Written on the ICE Bruxelles-Koeln on the way back from p2k15.

1 files changed, 6 insertions, 7 deletions

diff --git a/demandoc.c b/demandoc.c
index 679de959..937145de 100644
--- a/demandoc.c
+++ b/demandoc.c
@@ -110,21 +110,20 @@ usage(void)
 static void
 pmandoc(struct mparse *mp, int fd, const char *fn, int list)
 {
-	struct roff_man	*mdoc;
 	struct roff_man	*man;
 	int		 line, col;
 
 	mparse_readfd(mp, fd, fn);
-	mparse_result(mp, &mdoc, &man, NULL);
+	mparse_result(mp, &man, NULL);
 	line = 1;
 	col = 0;
 
-	if (mdoc)
-		pmdoc(mdoc_node(mdoc), &line, &col, list);
-	else if (man)
-		pman(man_node(man), &line, &col, list);
-	else
+	if (man == NULL)
 		return;
+	if (man->macroset == MACROSET_MDOC)
+		pmdoc(mdoc_node(man), &line, &col, list);
+	else
+		pman(man_node(man), &line, &col, list);
 
 	if ( ! list)
 		putchar('\n');