Third step towards parser unification:

[mandoc.git] / mandocdb.c

diff --git a/mandocdb.c b/mandocdb.c
index 73d7b108f0905ca945c584485b196176ba04eeec..55cb877d967ad0fc03791347f21606c1fddc35bd 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.189 2015/04/02 22:48:17 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.190 2015/04/02 23:48:19 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -130,7 +130,7 @@ enum        stmt {
        STMT__MAX
 };
 
-typedef        int (*mdoc_fp)(struct mpage *, const struct mdoc_meta *,
+typedef        int (*mdoc_fp)(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
 
 struct mdoc_handler {
@@ -156,28 +156,28 @@ static    void     mpages_free(void);
 static void     mpages_merge(struct mparse *);
 static void     names_check(void);
 static void     parse_cat(struct mpage *, int);
-static void     parse_man(struct mpage *, const struct man_meta *,
+static void     parse_man(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static void     parse_mdoc(struct mpage *, const struct mdoc_meta *,
+static void     parse_mdoc(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static int      parse_mdoc_body(struct mpage *, const struct mdoc_meta *,
+static int      parse_mdoc_body(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static int      parse_mdoc_head(struct mpage *, const struct mdoc_meta *,
+static int      parse_mdoc_head(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static int      parse_mdoc_Fd(struct mpage *, const struct mdoc_meta *,
+static int      parse_mdoc_Fd(struct mpage *, const struct roff_meta *,
                        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 *,
+static int      parse_mdoc_Fn(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static int      parse_mdoc_Fo(struct mpage *, const struct mdoc_meta *,
+static int      parse_mdoc_Fo(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static int      parse_mdoc_Nd(struct mpage *, const struct mdoc_meta *,
+static int      parse_mdoc_Nd(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static int      parse_mdoc_Nm(struct mpage *, const struct mdoc_meta *,
+static int      parse_mdoc_Nm(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static int      parse_mdoc_Sh(struct mpage *, const struct mdoc_meta *,
+static int      parse_mdoc_Sh(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
-static int      parse_mdoc_Xr(struct mpage *, const struct mdoc_meta *,
+static int      parse_mdoc_Xr(struct mpage *, const struct roff_meta *,
                        const struct roff_node *);
 static void     putkey(const struct mpage *, char *, uint64_t);
 static void     putkeys(const struct mpage *, char *, size_t, uint64_t);
@@ -1443,7 +1443,7 @@ putmdockey(const struct mpage *mpage,
 }
 
 static void
-parse_man(struct mpage *mpage, const struct man_meta *meta,
+parse_man(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
        const struct roff_node *head, *body;
@@ -1569,7 +1569,7 @@ parse_man(struct mpage *mpage, const struct man_meta *meta,
 }
 
 static void
-parse_mdoc(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 
@@ -1602,7 +1602,7 @@ parse_mdoc(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
-parse_mdoc_Fd(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_Fd(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
        char            *start, *end;
@@ -1667,7 +1667,7 @@ parse_mdoc_fname(struct mpage *mpage, const struct roff_node *n)
 }
 
 static int
-parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_Fn(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 
@@ -1684,7 +1684,7 @@ parse_mdoc_Fn(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
-parse_mdoc_Fo(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_Fo(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 
@@ -1698,7 +1698,7 @@ parse_mdoc_Fo(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
-parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_Xr(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
        char    *cp;
@@ -1718,7 +1718,7 @@ parse_mdoc_Xr(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
-parse_mdoc_Nd(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_Nd(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 
@@ -1728,7 +1728,7 @@ parse_mdoc_Nd(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
-parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_Nm(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 
@@ -1750,7 +1750,7 @@ parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
-parse_mdoc_Sh(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_Sh(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 
@@ -1758,7 +1758,7 @@ parse_mdoc_Sh(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
-parse_mdoc_head(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_head(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {
 
@@ -1766,7 +1766,7 @@ parse_mdoc_head(struct mpage *mpage, const struct mdoc_meta *meta,
 }
 
 static int
-parse_mdoc_body(struct mpage *mpage, const struct mdoc_meta *meta,
+parse_mdoc_body(struct mpage *mpage, const struct roff_meta *meta,
        const struct roff_node *n)
 {