diff options
| author |   schwarze <schwarze@openbsd.org> | 2015-04-19 14:57:16 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2015-04-19 14:57:16 +0000 |
| commit | e32c44d44d4f28d809d0c0876ba6e1da0df21214 (patch) | |
| tree | 1a4adf8046ea2a8fcb9afaa600132c91676255b4 /usr.bin/mandoc/man_macro.c | |
| parent | Bump minor, regen .pc and header (diff) | |
| download | wireguard-openbsd-e32c44d44d4f28d809d0c0876ba6e1da0df21214.tar.xz wireguard-openbsd-e32c44d44d4f28d809d0c0876ba6e1da0df21214.zip | |
Unify trickier node handling functions.
* man_elem_alloc() -> roff_elem_alloc()
* man_block_alloc() -> roff_block_alloc()
The functions mdoc_elem_alloc() and mdoc_block_alloc() remain for
now because they need to do mdoc(7)-specific argument processing.
Diffstat (limited to 'usr.bin/mandoc/man_macro.c')
| -rw-r--r-- | usr.bin/mandoc/man_macro.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c index d52a9f00e61..7a9e760f12e 100644 --- a/usr.bin/mandoc/man_macro.c +++ b/usr.bin/mandoc/man_macro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man_macro.c,v 1.69 2015/04/19 14:25:05 schwarze Exp $ */ +/* $OpenBSD: man_macro.c,v 1.70 2015/04/19 14:57:16 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -257,7 +257,7 @@ blk_exp(MACRO_PROT_ARGS) int la; rew_scope(man, tok); - man_block_alloc(man, line, ppos, tok); + roff_block_alloc(man, line, ppos, tok); head = roff_head_alloc(man, line, ppos, tok); la = *pos; @@ -287,8 +287,7 @@ blk_imp(MACRO_PROT_ARGS) struct roff_node *n; rew_scope(man, tok); - man_block_alloc(man, line, ppos, tok); - n = man->last; + n = roff_block_alloc(man, line, ppos, tok); if (n->tok == MAN_SH || n->tok == MAN_SS) man->flags &= ~MAN_LITERAL; n = roff_head_alloc(man, line, ppos, tok); @@ -327,7 +326,7 @@ in_line_eoln(MACRO_PROT_ARGS) char *p; struct roff_node *n; - man_elem_alloc(man, line, ppos, tok); + roff_elem_alloc(man, line, ppos, tok); n = man->last; for (;;) { |