diff options
| author |   schwarze <schwarze@openbsd.org> | 2015-04-18 17:50:02 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2015-04-18 17:50:02 +0000 |
| commit | 6d0e9b63214a57d2a8d4601ae6d64f62e423da8e (patch) | |
| tree | eee7efbc5bd98f8b0732368ef1fe23a587089815 /usr.bin/mandoc/mdoc_man.c | |
| parent | Unify {mdoc,man}_{alloc,reset,free}() into roff_man_{alloc,reset,free}(). (diff) | |
| download | wireguard-openbsd-6d0e9b63214a57d2a8d4601ae6d64f62e423da8e.tar.xz wireguard-openbsd-6d0e9b63214a57d2a8d4601ae6d64f62e423da8e.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 'usr.bin/mandoc/mdoc_man.c')
| -rw-r--r-- | usr.bin/mandoc/mdoc_man.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/usr.bin/mandoc/mdoc_man.c b/usr.bin/mandoc/mdoc_man.c index d74278347e2..1a228384d34 100644 --- a/usr.bin/mandoc/mdoc_man.c +++ b/usr.bin/mandoc/mdoc_man.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_man.c,v 1.90 2015/04/18 16:04:40 schwarze Exp $ */ +/* $OpenBSD: mdoc_man.c,v 1.91 2015/04/18 17:50:02 schwarze Exp $ */ /* * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org> * @@ -545,16 +545,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"); @@ -565,10 +561,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'); } |