diff options
Diffstat (limited to 'libmdocml.c')
| -rw-r--r-- | libmdocml.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/libmdocml.c b/libmdocml.c index 965a65e8..1a7f7c55 100644 --- a/libmdocml.c +++ b/libmdocml.c @@ -1,4 +1,4 @@ -/* $Id: libmdocml.c,v 1.20 2008/12/09 17:09:12 kristaps Exp $ */ +/* $Id: libmdocml.c,v 1.21 2008/12/10 14:42:46 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se> * @@ -130,6 +130,8 @@ static int md_run_leave(const struct md_args *args, struct md_mbuf *mbuf, struct md_rbuf *rbuf, int c, void *data) { + md_exit fp; + assert(args); assert(mbuf); assert(rbuf); @@ -137,15 +139,19 @@ md_run_leave(const struct md_args *args, struct md_mbuf *mbuf, /* Run exiters. */ switch (args->type) { case (MD_HTML): - if ( ! md_exit_html(data, -1 == c ? 0 : 1)) - c = -1; + fp = md_exit_html; + break; + case (MD_XML): + fp = md_exit_xml; break; default: - if ( ! md_exit_xml(data, -1 == c ? 0 : 1)) - c = -1; + fp = md_exit_noop; break; } + if ( ! (*fp)(data, -1 == c ? 0 : 1)) + c = -1; + /* Make final flush of buffer. */ if (-1 != c && ! md_buf_flush(mbuf)) return(-1); @@ -172,9 +178,12 @@ md_run_enter(const struct md_args *args, struct md_mbuf *mbuf, case (MD_HTML): fp = md_line_html; break; - default: + case (MD_XML): fp = md_line_xml; break; + default: + fp = md_line_noop; + break; } pos = 0; @@ -217,6 +226,7 @@ int md_run(const struct md_args *args, const struct md_buf *out, const struct md_buf *in) { + md_init fp; struct md_mbuf mbuf; struct md_rbuf rbuf; void *data; @@ -234,13 +244,18 @@ md_run(const struct md_args *args, /* Run initialisers. */ switch (args->type) { case (MD_HTML): - data = md_init_html(args, &mbuf, &rbuf); + fp = md_init_html; + break; + case (MD_XML): + fp = md_init_xml; break; default: - data = md_init_xml(args, &mbuf, &rbuf); + fp = md_init_noop; break; } + data = (*fp)(args, &mbuf, &rbuf); + /* Go into mainline. */ return(md_run_enter(args, &mbuf, &rbuf, data)); } |