Delete the wrapper functions mdoc_meta(), man_meta(), mdoc_node(),

man_node() from the mandoc(3) semi-public interface and the internal
wrapper functions print_mdoc() and print_man() from the HTML formatters.
Minus 60 lines of code, no functional change.

diff --git a/demandoc.c b/demandoc.c
index d4667c487ff086628f915ac0c4feff45ce825128..a51c8cca059e78fdda28dee353c9254b6ffed999 100644 (file)
--- 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.20 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -121,9 +121,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');

diff --git a/man.c b/man.c
index 608ef6cf5e09c7160a8b3ca337212abf04418cfc..b4463170e32eed239c2fa7911fa4d8eff759595a 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.156 2015/04/18 17:28:36 schwarze Exp $ */
+/*     $Id: man.c,v 1.157 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -62,20 +62,6 @@ static       int              man_ptext(struct roff_man *, int, char *, int);
 static int              man_pmacro(struct roff_man *, int, char *, int);
 
 
-const struct roff_node *
-man_node(const struct roff_man *man)
-{
-
-       return(man->first);
-}
-
-const struct roff_meta *
-man_meta(const struct roff_man *man)
-{
-
-       return(&man->meta);
-}
-
 void
 man_endparse(struct roff_man *man)
 {

diff --git a/man.h b/man.h
index 28f9abcd44d8a906414588cfeb5369f537f22859..9e77eee4e7a6cdd0ecb15256658ffe27ad3e7b76 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,4 +1,4 @@
-/*     $Id: man.h,v 1.73 2015/04/18 16:06:40 schwarze Exp $ */
+/*     $Id: man.h,v 1.74 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -63,8 +63,6 @@ __BEGIN_DECLS
 
 struct roff_man;
 
-const struct roff_node *man_node(const struct roff_man *);
-const struct roff_meta *man_meta(const struct roff_man *);
 const struct mparse   *man_mparse(const struct roff_man *);
 void man_deroff(char **, const struct roff_node *);
 

diff --git a/man_html.c b/man_html.c
index 35da21d4eab5fdd72f25312846185fde4048fd17..12266acb6ab9de7d83fe4c22db8b99f49b650d19 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/*     $Id: man_html.c,v 1.116 2015/04/18 16:06:40 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.117 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -54,7 +54,6 @@ struct        htmlman {
 
 static void              print_bvspace(struct html *,
                                const struct roff_node *);
-static void              print_man(MAN_ARGS);
 static void              print_man_head(MAN_ARGS);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);
@@ -148,33 +147,28 @@ void
 html_man(void *arg, const struct roff_man *man)
 {
        struct mhtml     mh;
-
-       memset(&mh, 0, sizeof(struct mhtml));
-       print_man(man_meta(man), man_node(man), &mh, (struct html *)arg);
-       putchar('\n');
-}
-
-static void
-print_man(MAN_ARGS)
-{
-       struct tag      *t, *tt;
        struct htmlpair  tag;
+       struct html     *h;
+       struct tag      *t, *tt;
 
+       memset(&mh, 0, sizeof(mh));
        PAIR_CLASS_INIT(&tag, "mandoc");
+       h = (struct html *)arg;
 
        if ( ! (HTML_FRAGMENT & h->oflags)) {
                print_gen_decls(h);
                t = print_otag(h, TAG_HTML, 0, NULL);
                tt = print_otag(h, TAG_HEAD, 0, NULL);
-               print_man_head(man, n, mh, h);
+               print_man_head(&man->meta, man->first, &mh, h);
                print_tagq(h, tt);
                print_otag(h, TAG_BODY, 0, NULL);
                print_otag(h, TAG_DIV, 1, &tag);
        } else
                t = print_otag(h, TAG_DIV, 1, &tag);
 
-       print_man_nodelist(man, n, mh, h);
+       print_man_nodelist(&man->meta, man->first, &mh, h);
        print_tagq(h, t);
+       putchar('\n');
 }
 
 static void

diff --git a/man_term.c b/man_term.c
index dc424128ba179e2898c95515f57438bd8f6e0c84..08a87f0f378877f763e1e434de36b5545eb97d43 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.180 2015/04/18 16:06:40 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.181 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -141,25 +141,20 @@ void
 terminal_man(void *arg, const struct roff_man *man)
 {
        struct termp            *p;
-       const struct roff_meta  *meta;
        struct roff_node        *n;
        struct mtermp            mt;
 
        p = (struct termp *)arg;
-
        p->overstep = 0;
        p->rmargin = p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
 
-       n = man_node(man)->child;
-       meta = man_meta(man);
-
        memset(&mt, 0, sizeof(struct mtermp));
-
        mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
        mt.offset = term_len(p, p->defindent);
        mt.pardist = 1;
 
+       n = man->first->child;
        if (p->synopsisonly) {
                while (n != NULL) {
                        if (n->tok == MAN_SH &&
@@ -167,7 +162,8 @@ terminal_man(void *arg, const struct roff_man *man)
                            !strcmp(n->child->child->string, "SYNOPSIS")) {
                                if (n->child->next->child != NULL)
                                        print_man_nodelist(p, &mt,
-                                           n->child->next->child, meta);
+                                           n->child->next->child,
+                                           &man->meta);
                                term_newln(p);
                                break;
                        }
@@ -176,10 +172,10 @@ terminal_man(void *arg, const struct roff_man *man)
        } else {
                if (p->defindent == 0)
                        p->defindent = 7;
-               term_begin(p, print_man_head, print_man_foot, meta);
+               term_begin(p, print_man_head, print_man_foot, &man->meta);
                p->flags |= TERMP_NOSPACE;
                if (n != NULL)
-                       print_man_nodelist(p, &mt, n, meta);
+                       print_man_nodelist(p, &mt, n, &man->meta);
                term_end(p);
        }
 }

diff --git a/mandocdb.c b/mandocdb.c
index 398f166638c8fadaeb093046f6c3f5397d2e3226..46bd4dfa23124132240da42c8588e6c9b33c5d99 100644 (file)
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $Id: mandocdb.c,v 1.192 2015/04/18 16:34:25 schwarze Exp $ */
+/*     $Id: mandocdb.c,v 1.193 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1195,19 +1195,18 @@ mpages_merge(struct mparse *mp)
                        goto nextpage;
                } else if (man != NULL && man->macroset == MACROSET_MDOC) {
                        mpage->form = FORM_SRC;
-                       mpage->sec = mdoc_meta(man)->msec;
+                       mpage->sec = man->meta.msec;
                        mpage->sec = mandoc_strdup(
                            mpage->sec == NULL ? "" : mpage->sec);
-                       mpage->arch = mdoc_meta(man)->arch;
+                       mpage->arch = man->meta.arch;
                        mpage->arch = mandoc_strdup(
                            mpage->arch == NULL ? "" : mpage->arch);
-                       mpage->title =
-                           mandoc_strdup(mdoc_meta(man)->title);
+                       mpage->title = mandoc_strdup(man->meta.title);
                } else if (man != NULL && man->macroset == MACROSET_MAN) {
                        mpage->form = FORM_SRC;
-                       mpage->sec = mandoc_strdup(man_meta(man)->msec);
+                       mpage->sec = mandoc_strdup(man->meta.msec);
                        mpage->arch = mandoc_strdup(mlink->arch);
-                       mpage->title = mandoc_strdup(man_meta(man)->title);
+                       mpage->title = mandoc_strdup(man->meta.title);
                } else {
                        mpage->form = FORM_CAT;
                        mpage->sec = mandoc_strdup(mlink->dsec);
@@ -1230,9 +1229,9 @@ mpages_merge(struct mparse *mp)
 
                assert(mpage->desc == NULL);
                if (man != NULL && man->macroset == MACROSET_MDOC)
-                       parse_mdoc(mpage, mdoc_meta(man), mdoc_node(man));
+                       parse_mdoc(mpage, &man->meta, man->first);
                else if (man != NULL)
-                       parse_man(mpage, man_meta(man), man_node(man));
+                       parse_man(mpage, &man->meta, man->first);
                else
                        parse_cat(mpage, fd);
                if (mpage->desc == NULL)

diff --git a/mdoc.c b/mdoc.c
index c3c36421a0605528b54c4e02c3495f9e8ac028e8..d0ccaa731663813c1a5c44d2ff86e4d4bd297334 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.245 2015/04/18 17:28:36 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.246 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -93,20 +93,6 @@ static       int               mdoc_ptext(struct roff_man *, int, char *, int);
 static int               mdoc_pmacro(struct roff_man *, int, char *, int);
 
 
-const struct roff_node *
-mdoc_node(const struct roff_man *mdoc)
-{
-
-       return(mdoc->first);
-}
-
-const struct roff_meta *
-mdoc_meta(const struct roff_man *mdoc)
-{
-
-       return(&mdoc->meta);
-}
-
 void
 mdoc_endparse(struct roff_man *mdoc)
 {

diff --git a/mdoc.h b/mdoc.h
index d8814575b99da1c70f04a49ffc6f9b23d83bf03f..ddfd4e1eee56c63c2fd48d9e0615e08c9e52585f 100644 (file)
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.h,v 1.140 2015/04/18 16:06:40 schwarze Exp $ */
+/*     $Id: mdoc.h,v 1.141 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -284,8 +284,6 @@ __BEGIN_DECLS
 
 struct roff_man;
 
-const struct roff_node *mdoc_node(const struct roff_man *);
-const struct roff_meta *mdoc_meta(const struct roff_man *);
 void mdoc_deroff(char **, const struct roff_node *);
 
 __END_DECLS

diff --git a/mdoc_html.c b/mdoc_html.c
index 62d7099371d913cb82b69ab6ba0da032cc01cd4d..85be95b668b32f7e6ecbb91d2a83676419fe62ab 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.231 2015/04/18 16:06:40 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.232 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -48,7 +48,6 @@ struct        htmlmdoc {
        void            (*post)(MDOC_ARGS);
 };
 
-static void              print_mdoc(MDOC_ARGS);
 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
@@ -264,15 +263,6 @@ static     const char * const lists[LIST_MAX] = {
 };
 
 
-void
-html_mdoc(void *arg, const struct roff_man *mdoc)
-{
-
-       print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc)->child,
-           (struct html *)arg);
-       putchar('\n');
-}
-
 /*
  * Calculate the scaling unit passed in a `-width' argument.  This uses
  * either a native scaling unit (e.g., 1i, 2m) or the string length of
@@ -331,29 +321,32 @@ synopsis_pre(struct html *h, const struct roff_node *n)
        }
 }
 
-static void
-print_mdoc(MDOC_ARGS)
+void
+html_mdoc(void *arg, const struct roff_man *mdoc)
 {
-       struct tag      *t, *tt;
        struct htmlpair  tag;
+       struct html     *h;
+       struct tag      *t, *tt;
 
        PAIR_CLASS_INIT(&tag, "mandoc");
+       h = (struct html *)arg;
 
        if ( ! (HTML_FRAGMENT & h->oflags)) {
                print_gen_decls(h);
                t = print_otag(h, TAG_HTML, 0, NULL);
                tt = print_otag(h, TAG_HEAD, 0, NULL);
-               print_mdoc_head(meta, n, h);
+               print_mdoc_head(&mdoc->meta, mdoc->first->child, h);
                print_tagq(h, tt);
                print_otag(h, TAG_BODY, 0, NULL);
                print_otag(h, TAG_DIV, 1, &tag);
        } else
                t = print_otag(h, TAG_DIV, 1, &tag);
 
-       mdoc_root_pre(meta, n, h);
-       print_mdoc_nodelist(meta, n, h);
-       mdoc_root_post(meta, n, h);
+       mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);
+       print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);
+       mdoc_root_post(&mdoc->meta, mdoc->first->child, h);
        print_tagq(h, t);
+       putchar('\n');
 }
 
 static void

diff --git a/mdoc_man.c b/mdoc_man.c
index 10daa6976520e83d07c83ce2389b514ceb7fd5f9..4ea0fa246ee8c029645a6fdbbf8b1b48cba3503f 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.92 2015/04/18 16:06:40 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.93 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -547,16 +547,12 @@ man_man(void *arg, const struct roff_man *man)
 void
 man_mdoc(void *arg, const struct roff_man *mdoc)
 {
-       const struct roff_meta *meta;
        struct roff_node *n;
 
-       meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc)->child;
-
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
-           meta->title,
-           (meta->msec == NULL ? "" : meta->msec),
-           meta->date, meta->os, meta->vol);
+           mdoc->meta.title,
+           (mdoc->meta.msec == NULL ? "" : mdoc->meta.msec),
+           mdoc->meta.date, mdoc->meta.os, mdoc->meta.vol);
 
        /* Disable hyphenation and if nroff, disable justification. */
        printf(".nh\n.if n .ad l");
@@ -567,10 +563,8 @@ man_mdoc(void *arg, const struct roff_man *mdoc)
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
-       while (n != NULL) {
-               print_node(meta, n);
-               n = n->next;
-       }
+       for (n = mdoc->first->child; n != NULL; n = n->next)
+               print_node(&mdoc->meta, n);
        putchar('\n');
 }
 

diff --git a/mdoc_term.c b/mdoc_term.c
index f2b081a6f383c4a9d72fadc9c2b3ea0138ed48c0..be170bf549885902d9a0c7e823ce3cc4ff0050d1 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.318 2015/04/18 16:06:41 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.319 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -253,25 +253,22 @@ static    const struct termact termacts[MDOC_MAX] = {
 void
 terminal_mdoc(void *arg, const struct roff_man *mdoc)
 {
-       const struct roff_meta  *meta;
        struct roff_node        *n;
        struct termp            *p;
 
        p = (struct termp *)arg;
-
        p->overstep = 0;
        p->rmargin = p->maxrmargin = p->defrmargin;
        p->tabwidth = term_len(p, 5);
 
-       n = mdoc_node(mdoc)->child;
-       meta = mdoc_meta(mdoc);
-
+       n = mdoc->first->child;
        if (p->synopsisonly) {
                while (n != NULL) {
                        if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {
                                if (n->child->next->child != NULL)
                                        print_mdoc_nodelist(p, NULL,
-                                           meta, n->child->next->child);
+                                           &mdoc->meta,
+                                           n->child->next->child);
                                term_newln(p);
                                break;
                        }
@@ -280,11 +277,12 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
        } else {
                if (p->defindent == 0)
                        p->defindent = 5;
-               term_begin(p, print_mdoc_head, print_mdoc_foot, meta);
+               term_begin(p, print_mdoc_head, print_mdoc_foot,
+                   &mdoc->meta);
                if (n != NULL) {
                        if (n->tok != MDOC_Sh)
                                term_vspace(p);
-                       print_mdoc_nodelist(p, NULL, meta, n);
+                       print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
                }
                term_end(p);
        }

diff --git a/tree.c b/tree.c
index 8a5ba4520dabfb349faa0654e0bfe0b027d38027..8673f45b6953667e234901da9d37576dad86c0eb 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-/*     $Id: tree.c,v 1.65 2015/04/18 16:06:41 schwarze Exp $ */
+/*     $Id: tree.c,v 1.66 2015/04/18 17:53:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -41,14 +41,14 @@ void
 tree_mdoc(void *arg, const struct roff_man *mdoc)
 {
 
-       print_mdoc(mdoc_node(mdoc)->child, 0);
+       print_mdoc(mdoc->first->child, 0);
 }
 
 void
 tree_man(void *arg, const struct roff_man *man)
 {
 
-       print_man(man_node(man)->child, 0);
+       print_man(man->first->child, 0);
 }
 
 static void