diff options
Diffstat (limited to 'usr.bin/mandoc/man_macro.c')
| -rw-r--r-- | usr.bin/mandoc/man_macro.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c index 1f3ee5aed95..cbaf4e7b171 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.63 2015/04/02 21:03:18 schwarze Exp $ */ +/* $OpenBSD: man_macro.c,v 1.64 2015/04/02 22:06:17 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -42,12 +42,11 @@ static void in_line_eoln(MACRO_PROT_ARGS); static int man_args(struct man *, int, int *, char *, char **); -static void rew_scope(enum roff_type, - struct man *, enum mant); -static enum rew rew_dohalt(enum mant, enum roff_type, - const struct man_node *); -static enum rew rew_block(enum mant, enum roff_type, - const struct man_node *); +static void rew_scope(enum roff_type, struct man *, int); +static enum rew rew_dohalt(int, enum roff_type, + const struct roff_node *); +static enum rew rew_block(int, enum roff_type, + const struct roff_node *); const struct man_macro __man_macros[MAN_MAX] = { { in_line_eoln, MAN_NSCOPED }, /* br */ @@ -94,9 +93,9 @@ const struct man_macro * const man_macros = __man_macros; void -man_unscope(struct man *man, const struct man_node *to) +man_unscope(struct man *man, const struct roff_node *to) { - struct man_node *n; + struct roff_node *n; to = to->parent; n = man->last; @@ -154,7 +153,7 @@ man_unscope(struct man *man, const struct man_node *to) } static enum rew -rew_block(enum mant ntok, enum roff_type type, const struct man_node *n) +rew_block(int ntok, enum roff_type type, const struct roff_node *n) { if (type == ROFFT_BLOCK && n->parent->tok == ntok && @@ -169,7 +168,7 @@ rew_block(enum mant ntok, enum roff_type type, const struct man_node *n) * sections and subsections). */ static enum rew -rew_dohalt(enum mant tok, enum roff_type type, const struct man_node *n) +rew_dohalt(int tok, enum roff_type type, const struct roff_node *n) { enum rew c; @@ -242,9 +241,9 @@ rew_dohalt(enum mant tok, enum roff_type type, const struct man_node *n) * scopes. When a scope is closed, it must be validated and actioned. */ static void -rew_scope(enum roff_type type, struct man *man, enum mant tok) +rew_scope(enum roff_type type, struct man *man, int tok) { - struct man_node *n; + struct roff_node *n; enum rew c; for (n = man->last; n; n = n->parent) { @@ -275,8 +274,8 @@ rew_scope(enum roff_type type, struct man *man, enum mant tok) void blk_close(MACRO_PROT_ARGS) { - enum mant ntok; - const struct man_node *nn; + int ntok; + const struct roff_node *nn; char *p; int nrew, target; @@ -336,7 +335,7 @@ blk_close(MACRO_PROT_ARGS) void blk_exp(MACRO_PROT_ARGS) { - struct man_node *head; + struct roff_node *head; char *p; int la; @@ -369,7 +368,7 @@ blk_imp(MACRO_PROT_ARGS) { int la; char *p; - struct man_node *n; + struct roff_node *n; rew_scope(ROFFT_BODY, man, tok); rew_scope(ROFFT_BLOCK, man, tok); @@ -409,7 +408,7 @@ in_line_eoln(MACRO_PROT_ARGS) { int la; char *p; - struct man_node *n; + struct roff_node *n; man_elem_alloc(man, line, ppos, tok); n = man->last; |