diff options
| author |   schwarze <schwarze@openbsd.org> | 2015-04-19 14:25:05 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2015-04-19 14:25:05 +0000 |
| commit | 69c34eaaf29fe77dac7242155496c52d521ae721 (patch) | |
| tree | 36da78899892fb238907f9245618f0c07acc051f /usr.bin/mandoc/man_macro.c | |
| parent | Merge conflicts (diff) | |
| download | wireguard-openbsd-69c34eaaf29fe77dac7242155496c52d521ae721.tar.xz wireguard-openbsd-69c34eaaf29fe77dac7242155496c52d521ae721.zip | |
Unify some node handling functions that use TOKEN_NONE.
* mdoc_word_alloc(), man_word_alloc() -> roff_word_alloc()
* mdoc_word_append(), man_word_append() -> roff_word_append()
* mdoc_addspan(), man_addspan() -> roff_addtbl()
* mdoc_addeqn(), man_addeqn() -> roff_addeqn()
Minus 50 lines of code, no functional change.
Diffstat (limited to 'usr.bin/mandoc/man_macro.c')
| -rw-r--r-- | usr.bin/mandoc/man_macro.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c index 2c8e9c6848b..d52a9f00e61 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.68 2015/04/19 13:50:10 schwarze Exp $ */ +/* $OpenBSD: man_macro.c,v 1.69 2015/04/19 14:25:05 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -262,7 +262,7 @@ blk_exp(MACRO_PROT_ARGS) la = *pos; if (man_args(man, line, pos, buf, &p)) - man_word_alloc(man, line, la, p); + roff_word_alloc(man, line, la, p); if (buf[*pos] != '\0') mandoc_vmsg(MANDOCERR_ARG_EXCESS, @@ -299,7 +299,7 @@ blk_imp(MACRO_PROT_ARGS) la = *pos; if ( ! man_args(man, line, pos, buf, &p)) break; - man_word_alloc(man, line, la, p); + roff_word_alloc(man, line, la, p); } /* @@ -350,9 +350,9 @@ in_line_eoln(MACRO_PROT_ARGS) break; if (man_macros[tok].flags & MAN_JOIN && man->last->type == ROFFT_TEXT) - man_word_append(man, p); + roff_word_append(man, p); else - man_word_alloc(man, line, la, p); + roff_word_alloc(man, line, la, p); } /* |