diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-04-18 17:53:21 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-04-18 17:53:21 +0000 |
commit | 28e0682df89260767e1ad5a3af0b93e504ae5290 (patch) | |
tree | e1bd4cc5ee13a989fdaa752597ae30a9a5710491 /man_html.c | |
parent | acfef3c388fe4c84eaad68e8f398c7873f1bb732 (diff) | |
download | mandoc-28e0682df89260767e1ad5a3af0b93e504ae5290.tar.gz mandoc-28e0682df89260767e1ad5a3af0b93e504ae5290.tar.zst mandoc-28e0682df89260767e1ad5a3af0b93e504ae5290.zip |
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.
Diffstat (limited to 'man_html.c')
-rw-r--r-- | man_html.c | 22 |
1 files changed, 8 insertions, 14 deletions
@@ -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 |