diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2015-04-19 14:57:38 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-04-19 14:57:38 +0000 |
| commit | c599b29874a76cbd98a6af0d536d744e679bb1f5 (patch) | |
| tree | 2b4131d196075429d0256ae87e29735403934586 /man_macro.c | |
| parent | b41835362693d09c3eff29cb37f2217b9dca8cc3 (diff) | |
| download | mandoc-c599b29874a76cbd98a6af0d536d744e679bb1f5.tar.gz | |
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 'man_macro.c')
| -rw-r--r-- | man_macro.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/man_macro.c b/man_macro.c index ab5e3ffc..d540fc4a 100644 --- a/man_macro.c +++ b/man_macro.c @@ -259,7 +259,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; @@ -289,8 +289,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); @@ -329,7 +328,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 (;;) { |