===================================================================
RCS file: /cvs/mandoc/Attic/libmdocml.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- mandoc/Attic/libmdocml.c	2008/12/09 17:09:12	1.20
+++ mandoc/Attic/libmdocml.c	2008/12/10 14:42:46	1.21
@@ -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_mbu
 	/* 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_mbu
 	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,12 +244,17 @@ 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));