===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- src/usr.bin/mandoc/mandocdb.c	2015/04/02 21:03:18	1.141
+++ src/usr.bin/mandoc/mandocdb.c	2015/04/02 22:06:17	1.142
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mandocdb.c,v 1.141 2015/04/02 21:03:18 schwarze Exp $ */
+/*	$OpenBSD: mandocdb.c,v 1.142 2015/04/02 22:06:17 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -121,7 +121,7 @@
 };
 
 typedef	int (*mdoc_fp)(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 
 struct	mdoc_handler {
 	mdoc_fp		 fp; /* optional handler */
@@ -147,32 +147,32 @@
 static	void	 names_check(void);
 static	void	 parse_cat(struct mpage *, int);
 static	void	 parse_man(struct mpage *, const struct man_meta *,
-			const struct man_node *);
+			const struct roff_node *);
 static	void	 parse_mdoc(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	int	 parse_mdoc_body(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	int	 parse_mdoc_head(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	int	 parse_mdoc_Fd(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
-static	void	 parse_mdoc_fname(struct mpage *, const struct mdoc_node *);
+			const struct roff_node *);
+static	void	 parse_mdoc_fname(struct mpage *, const struct roff_node *);
 static	int	 parse_mdoc_Fn(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	int	 parse_mdoc_Fo(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	int	 parse_mdoc_Nd(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	int	 parse_mdoc_Nm(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	int	 parse_mdoc_Sh(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	int	 parse_mdoc_Xr(struct mpage *, const struct mdoc_meta *,
-			const struct mdoc_node *);
+			const struct roff_node *);
 static	void	 putkey(const struct mpage *, char *, uint64_t);
 static	void	 putkeys(const struct mpage *, char *, size_t, uint64_t);
 static	void	 putmdockey(const struct mpage *,
-			const struct mdoc_node *, uint64_t);
+			const struct roff_node *, uint64_t);
 static	int	 render_string(char **, size_t *);
 static	void	 say(const char *, const char *, ...);
 static	int	 set_basedir(const char *, int);
@@ -1413,7 +1413,7 @@
  */
 static void
 putmdockey(const struct mpage *mpage,
-	const struct mdoc_node *n, uint64_t m)
+	const struct roff_node *n, uint64_t m)
 {
 
 	for ( ; NULL != n; n = n->next) {
@@ -1426,9 +1426,9 @@
 
 static void
 parse_man(struct mpage *mpage, const struct man_meta *meta,
-	const struct man_node *n)
+	const struct roff_node *n)
 {
-	const struct man_node *head, *body;
+	const struct roff_node *head, *body;
 	char		*start, *title;
 	char		 byte;
 	size_t		 sz;
@@ -1552,7 +1552,7 @@
 
 static void
 parse_mdoc(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 
 	assert(NULL != n);
@@ -1585,7 +1585,7 @@
 
 static int
 parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 	char		*start, *end;
 	size_t		 sz;
@@ -1628,7 +1628,7 @@
 }
 
 static void
-parse_mdoc_fname(struct mpage *mpage, const struct mdoc_node *n)
+parse_mdoc_fname(struct mpage *mpage, const struct roff_node *n)
 {
 	char	*cp;
 	size_t	 sz;
@@ -1650,7 +1650,7 @@
 
 static int
 parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 
 	if (n->child == NULL)
@@ -1667,7 +1667,7 @@
 
 static int
 parse_mdoc_Fo(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 
 	if (n->type != ROFFT_HEAD)
@@ -1681,7 +1681,7 @@
 
 static int
 parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 	char	*cp;
 
@@ -1701,7 +1701,7 @@
 
 static int
 parse_mdoc_Nd(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 
 	if (n->type == ROFFT_BODY)
@@ -1711,7 +1711,7 @@
 
 static int
 parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 
 	if (SEC_NAME == n->sec)
@@ -1733,7 +1733,7 @@
 
 static int
 parse_mdoc_Sh(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 
 	return(n->sec == SEC_CUSTOM && n->type == ROFFT_HEAD);
@@ -1741,7 +1741,7 @@
 
 static int
 parse_mdoc_head(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 
 	return(n->type == ROFFT_HEAD);
@@ -1749,7 +1749,7 @@
 
 static int
 parse_mdoc_body(struct mpage *mpage, const struct mdoc_meta *meta,
-	const struct mdoc_node *n)
+	const struct roff_node *n)
 {
 
 	return(n->type == ROFFT_BODY);