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 | de2a1122a661dd4bd4004854891d44e87d63c6c2 (patch) | |
| tree | 79380a193e1374fd7e4b697152b0b7aea304ddf8 /mdoc_html.c | |
| parent | 3f485a7ff74c3707363ed47362ccc8a7855b0f58 (diff) | |
| download | mandoc-de2a1122a661dd4bd4004854891d44e87d63c6c2.tar.gz mandoc-de2a1122a661dd4bd4004854891d44e87d63c6c2.tar.zst mandoc-de2a1122a661dd4bd4004854891d44e87d63c6c2.zip | |
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_html.c')
| -rw-r--r-- | mdoc_html.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mdoc_html.c b/mdoc_html.c index f50de8a7..238fc799 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.310 2018/07/27 17:49:31 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.311 2018/08/17 20:33:37 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014,2015,2016,2017,2018 Ingo Schwarze <schwarze@openbsd.org> @@ -42,7 +42,7 @@ #define MIN(a,b) ((/*CONSTCOND*/(a)<(b))?(a):(b)) #endif -struct htmlmdoc { +struct mdoc_html_act { int (*pre)(MDOC_ARGS); void (*post)(MDOC_ARGS); }; @@ -119,7 +119,7 @@ static int mdoc_vt_pre(MDOC_ARGS); static int mdoc_xr_pre(MDOC_ARGS); static int mdoc_xx_pre(MDOC_ARGS); -static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_Dd] = { +static const struct mdoc_html_act mdoc_html_acts[MDOC_MAX - MDOC_Dd] = { {NULL, NULL}, /* Dd */ {NULL, NULL}, /* Dt */ {NULL, NULL}, /* Os */ @@ -241,7 +241,6 @@ static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_Dd] = { {mdoc__x_pre, mdoc__x_post}, /* %U */ {NULL, NULL}, /* Ta */ }; -static const struct htmlmdoc *const mdocs = __mdocs - MDOC_Dd; /* @@ -402,9 +401,10 @@ print_mdoc_node(MDOC_ARGS) break; } assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); - if (mdocs[n->tok].pre != NULL && + if (mdoc_html_acts[n->tok - MDOC_Dd].pre != NULL && (n->end == ENDBODY_NOT || n->child != NULL)) - child = (*mdocs[n->tok].pre)(meta, n, h); + child = (*mdoc_html_acts[n->tok - MDOC_Dd].pre)(meta, + n, h); break; } @@ -423,10 +423,10 @@ print_mdoc_node(MDOC_ARGS) break; default: if (n->tok < ROFF_MAX || - mdocs[n->tok].post == NULL || + mdoc_html_acts[n->tok - MDOC_Dd].post == NULL || n->flags & NODE_ENDED) break; - (*mdocs[n->tok].post)(meta, n, h); + (*mdoc_html_acts[n->tok - MDOC_Dd].post)(meta, n, h); if (n->end != ENDBODY_NOT) n->body->flags |= NODE_ENDED; break; |