Third step towards parser unification:

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 410f941e88614435d215cf5c7952f75b408d75a7..44b03b5c4e524b7efa4bb9206a3f8002574dc0e3 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.315 2015/04/02 22:48:17 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.316 2015/04/02 23:48:20 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -43,7 +43,7 @@ struct        termpair {
 
 #define        DECL_ARGS struct termp *p, \
                  struct termpair *pair, \
-                 const struct mdoc_meta *meta, \
+                 const struct roff_meta *meta, \
                  struct roff_node *n
 
 struct termact {
@@ -58,8 +58,8 @@ static        void      print_bvspace(struct termp *,
                        const struct roff_node *);
 static void      print_mdoc_node(DECL_ARGS);
 static void      print_mdoc_nodelist(DECL_ARGS);
-static void      print_mdoc_head(struct termp *, const void *);
-static void      print_mdoc_foot(struct termp *, const void *);
+static void      print_mdoc_head(struct termp *, const struct roff_meta *);
+static void      print_mdoc_foot(struct termp *, const struct roff_meta *);
 static void      synopsis_pre(struct termp *,
                        const struct roff_node *);
 
@@ -253,7 +253,7 @@ static      const struct termact termacts[MDOC_MAX] = {
 void
 terminal_mdoc(void *arg, const struct mdoc *mdoc)
 {
-       const struct mdoc_meta  *meta;
+       const struct roff_meta  *meta;
        struct roff_node        *n;
        struct termp            *p;
 
@@ -407,13 +407,10 @@ print_mdoc_node(DECL_ARGS)
 }
 
 static void
-print_mdoc_foot(struct termp *p, const void *arg)
+print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
 {
-       const struct mdoc_meta *meta;
        size_t sz;
 
-       meta = (const struct mdoc_meta *)arg;
-
        term_fontrepl(p, TERMFONT_NONE);
 
        /*
@@ -459,14 +456,11 @@ print_mdoc_foot(struct termp *p, const void *arg)
 }
 
 static void
-print_mdoc_head(struct termp *p, const void *arg)
+print_mdoc_head(struct termp *p, const struct roff_meta *meta)
 {
-       const struct mdoc_meta  *meta;
        char                    *volume, *title;
        size_t                   vollen, titlen;
 
-       meta = (const struct mdoc_meta *)arg;
-
        /*
         * The header is strange.  It has three components, which are
         * really two with the first duplicated.  It goes like this: