X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/70a9dbd1a5a305812354c332d729472bd2c06561..38835fc941bf12f49824b7238cd2312b188777cf:/demandoc.c?ds=sidebyside

diff --git a/demandoc.c b/demandoc.c
index d4667c48..deaa7909 100644
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*	$Id: demandoc.c,v 1.19 2015/04/18 16:34:25 schwarze Exp $ */
+/*	$Id: demandoc.c,v 1.22 2015/10/13 22:59:54 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -44,7 +44,6 @@ int
 main(int argc, char *argv[])
 {
 	struct mparse	*mp;
-	struct mchars	*mchars;
 	int		 ch, fd, i, list;
 	extern int	 optind;
 
@@ -73,14 +72,14 @@ main(int argc, char *argv[])
 			break;
 		default:
 			usage();
-			return((int)MANDOCLEVEL_BADARG);
+			return (int)MANDOCLEVEL_BADARG;
 		}
 
 	argc -= optind;
 	argv += optind;
 
-	mchars = mchars_alloc();
-	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, mchars, NULL);
+	mchars_alloc();
+	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, NULL);
 	assert(mp);
 
 	if (argc < 1)
@@ -96,8 +95,8 @@ main(int argc, char *argv[])
 	}
 
 	mparse_free(mp);
-	mchars_free(mchars);
-	return((int)MANDOCLEVEL_OK);
+	mchars_free();
+	return (int)MANDOCLEVEL_OK;
 }
 
 static void
@@ -121,9 +120,9 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list)
 	if (man == NULL)
 		return;
 	if (man->macroset == MACROSET_MDOC)
-		pmdoc(mdoc_node(man), &line, &col, list);
+		pmdoc(man->first->child, &line, &col, list);
 	else
-		pman(man_node(man), &line, &col, list);
+		pman(man->first->child, &line, &col, list);
 
 	if ( ! list)
 		putchar('\n');