summaryrefslogtreecommitdiffstats
path: root/cgi.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2015-10-13 22:59:54 +0000
committerIngo Schwarze <schwarze@openbsd.org>2015-10-13 22:59:54 +0000
commitb26f648a71b3259c793410232a0d3bbdd0aa54e3 (patch)
tree38c696a975659d4498c81dddfc966f0e30bc6326 /cgi.c
parent35c8bbbbc8de3992d8c2d207662d365f4d566865 (diff)
downloadmandoc-b26f648a71b3259c793410232a0d3bbdd0aa54e3.tar.gz
Major character table cleanup:
* Use ohash(3) rather than a hand-rolled hash table. * Make the character table static in the chars.c module: There is no need to pass a pointer around, we most certainly never want to use two different character tables concurrently. * No need to keep the characters in a separate file chars.in; that merely encourages downstream porters to mess with them. * Sort the characters to agree with the mandoc_chars(7) manual page. * Specify Unicode codepoints in hex, not decimal (that's the detail that originally triggered this patch). No functional change, minus 100 LOC, and i don't see a performance change.
Diffstat (limited to 'cgi.c')
-rw-r--r--cgi.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/cgi.c b/cgi.c
index 75ed46a6..88ae6457 100644
--- a/cgi.c
+++ b/cgi.c
@@ -819,7 +819,6 @@ format(const struct req *req, const char *file)
{
struct manoutput conf;
struct mparse *mp;
- struct mchars *mchars;
struct roff_man *man;
void *vp;
int fd;
@@ -830,9 +829,8 @@ format(const struct req *req, const char *file)
return;
}
- mchars = mchars_alloc();
- mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL,
- mchars, req->q.manpath);
+ mchars_alloc();
+ mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, req->q.manpath);
mparse_readfd(mp, fd, file);
close(fd);
@@ -852,11 +850,11 @@ format(const struct req *req, const char *file)
req->q.manpath, file);
pg_error_internal();
mparse_free(mp);
- mchars_free(mchars);
+ mchars_free();
return;
}
- vp = html_alloc(mchars, &conf);
+ vp = html_alloc(&conf);
if (man->macroset == MACROSET_MDOC)
html_mdoc(vp, man);
@@ -865,7 +863,7 @@ format(const struct req *req, const char *file)
html_free(vp);
mparse_free(mp);
- mchars_free(mchars);
+ mchars_free();
free(conf.man);
}