summaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2015-10-19 19:51:22 +0000
committerIngo Schwarze <schwarze@openbsd.org>2015-10-19 19:51:22 +0000
commit7d197786f35a7ce70cff2bd82890edcd85ce584f (patch)
tree48eda75e32a5e6c7de1e2810cee8a47ce6bb94fd /main.c
parent4c6457b5f1c34869decdbd6fb28b2755d203f3d9 (diff)
downloadmandoc-7d197786f35a7ce70cff2bd82890edcd85ce584f.tar.gz
Simplify, no functional change:
Delete the outmdoc, outman, and outfree function pointers.
Diffstat (limited to 'main.c')
-rw-r--r--main.c86
1 files changed, 51 insertions, 35 deletions
diff --git a/main.c b/main.c
index d6d36046..2da28ac5 100644
--- a/main.c
+++ b/main.c
@@ -59,10 +59,6 @@ enum outmode {
OUTMODE_ONE
};
-typedef void (*out_mdoc)(void *, const struct roff_man *);
-typedef void (*out_man)(void *, const struct roff_man *);
-typedef void (*out_free)(void *);
-
enum outt {
OUTT_ASCII = 0, /* -Tascii */
OUTT_LOCALE, /* -Tlocale */
@@ -80,9 +76,6 @@ struct curparse {
enum mandoclevel wlevel; /* ignore messages below this */
int wstop; /* stop after a file with a warning */
enum outt outtype; /* which output to use */
- out_mdoc outmdoc; /* mdoc output ptr */
- out_man outman; /* man output ptr */
- out_free outfree; /* free output ptr */
void *outdata; /* data for output */
struct manoutput *outopts; /* output options */
};
@@ -473,8 +466,22 @@ main(int argc, char *argv[])
mparse_reset(curp.mp);
}
- if (curp.outfree)
- (*curp.outfree)(curp.outdata);
+ switch (curp.outtype) {
+ case OUTT_HTML:
+ html_free(curp.outdata);
+ break;
+ case OUTT_UTF8:
+ case OUTT_LOCALE:
+ case OUTT_ASCII:
+ ascii_free(curp.outdata);
+ break;
+ case OUTT_PDF:
+ case OUTT_PS:
+ pspdf_free(curp.outdata);
+ break;
+ default:
+ break;
+ }
mparse_free(curp.mp);
mchars_free();
@@ -657,72 +664,81 @@ parse(struct curparse *curp, int fd, const char *file)
/* If unset, allocate output dev now (if applicable). */
- if ( ! (curp->outman && curp->outmdoc)) {
+ if (curp->outdata == NULL) {
switch (curp->outtype) {
case OUTT_HTML:
curp->outdata = html_alloc(curp->outopts);
- curp->outfree = html_free;
break;
case OUTT_UTF8:
curp->outdata = utf8_alloc(curp->outopts);
- curp->outfree = ascii_free;
break;
case OUTT_LOCALE:
curp->outdata = locale_alloc(curp->outopts);
- curp->outfree = ascii_free;
break;
case OUTT_ASCII:
curp->outdata = ascii_alloc(curp->outopts);
- curp->outfree = ascii_free;
break;
case OUTT_PDF:
curp->outdata = pdf_alloc(curp->outopts);
- curp->outfree = pspdf_free;
break;
case OUTT_PS:
curp->outdata = ps_alloc(curp->outopts);
- curp->outfree = pspdf_free;
break;
default:
break;
}
+ }
+
+ mparse_result(curp->mp, &man, NULL);
+ /* Execute the out device, if it exists. */
+
+ if (man == NULL)
+ return;
+ if (man->macroset == MACROSET_MDOC) {
switch (curp->outtype) {
case OUTT_HTML:
- curp->outman = html_man;
- curp->outmdoc = html_mdoc;
+ html_mdoc(curp->outdata, man);
break;
case OUTT_TREE:
- curp->outman = tree_man;
- curp->outmdoc = tree_mdoc;
+ tree_mdoc(curp->outdata, man);
break;
case OUTT_MAN:
- curp->outmdoc = man_mdoc;
- curp->outman = man_man;
+ man_mdoc(curp->outdata, man);
break;
case OUTT_PDF:
case OUTT_ASCII:
case OUTT_UTF8:
case OUTT_LOCALE:
case OUTT_PS:
- curp->outman = terminal_man;
- curp->outmdoc = terminal_mdoc;
+ terminal_mdoc(curp->outdata, man);
+ break;
+ default:
+ break;
+ }
+ }
+ if (man->macroset == MACROSET_MAN) {
+ switch (curp->outtype) {
+ case OUTT_HTML:
+ html_man(curp->outdata, man);
+ break;
+ case OUTT_TREE:
+ tree_man(curp->outdata, man);
+ break;
+ case OUTT_MAN:
+ man_man(curp->outdata, man);
+ break;
+ case OUTT_PDF:
+ case OUTT_ASCII:
+ case OUTT_UTF8:
+ case OUTT_LOCALE:
+ case OUTT_PS:
+ terminal_man(curp->outdata, man);
break;
default:
break;
}
}
-
- mparse_result(curp->mp, &man, NULL);
-
- /* Execute the out device, if it exists. */
-
- if (man == NULL)
- return;
- if (curp->outmdoc != NULL && man->macroset == MACROSET_MDOC)
- (*curp->outmdoc)(curp->outdata, man);
- if (curp->outman != NULL && man->macroset == MACROSET_MAN)
- (*curp->outman)(curp->outdata, man);
}
static void