diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-17 20:33:37 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-17 20:33:37 +0000 |
| commit | a55868d2cb7c07237689f307d3a55b33b257de09 (patch) | |
| tree | 6e622b38423ae091b6a8a02b0843ea2bfb7958b4 /mdoc_state.c | |
| parent | f6077aba4f0b9ece3ceff820c0c651d148df1a37 (diff) | |
| download | mandoc-a55868d2cb7c07237689f307d3a55b33b257de09.tar.gz | |
Remove more pointer arithmetic passing via regions outside the array
that is undefined according to the C standard. Robert Elz <kre at
munnari dot oz dot au> pointed out i wasn't quite done yet.
Diffstat (limited to 'mdoc_state.c')
| -rw-r--r-- | mdoc_state.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mdoc_state.c b/mdoc_state.c index d5428e2f..f96065ba 100644 --- a/mdoc_state.c +++ b/mdoc_state.c @@ -36,7 +36,7 @@ static void state_dl(STATE_ARGS); static void state_sh(STATE_ARGS); static void state_sm(STATE_ARGS); -static const state_handler __state_handlers[MDOC_MAX - MDOC_Dd] = { +static const state_handler state_handlers[MDOC_MAX - MDOC_Dd] = { NULL, /* Dd */ NULL, /* Dt */ NULL, /* Os */ @@ -158,7 +158,6 @@ static const state_handler __state_handlers[MDOC_MAX - MDOC_Dd] = { NULL, /* %U */ NULL, /* Ta */ }; -static const state_handler *const state_handlers = __state_handlers - MDOC_Dd; void @@ -170,10 +169,10 @@ mdoc_state(struct roff_man *mdoc, struct roff_node *n) return; assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); - if ( ! (mdoc_macros[n->tok].flags & MDOC_PROLOGUE)) + if ((mdoc_macro(n->tok)->flags & MDOC_PROLOGUE) == 0) mdoc->flags |= MDOC_PBODY; - handler = state_handlers[n->tok]; + handler = state_handlers[n->tok - MDOC_Dd]; if (*handler) (*handler)(mdoc, n); } |