===================================================================
RCS file: /cvs/mandoc/Attic/libmdocml.c,v
retrieving revision 1.12
retrieving revision 1.17
diff -u -p -r1.12 -r1.17
--- mandoc/Attic/libmdocml.c	2008/11/28 11:21:12	1.12
+++ mandoc/Attic/libmdocml.c	2008/12/02 00:10:37	1.17
@@ -1,4 +1,4 @@
-/* $Id: libmdocml.c,v 1.12 2008/11/28 11:21:12 kristaps Exp $ */
+/* $Id: libmdocml.c,v 1.17 2008/12/02 00:10:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -56,8 +56,7 @@ md_buf_fill(struct md_rbuf *in)
 }
 
 
-static int
-md_buf_flush(struct md_mbuf *buf)
+static int md_buf_flush(struct md_mbuf *buf)
 {
 	ssize_t		 sz;
 
@@ -86,6 +85,8 @@ md_buf_flush(struct md_mbuf *buf)
 int
 md_buf_putchar(struct md_mbuf *buf, char c)
 {
+
+	assert(buf);
 	return(md_buf_puts(buf, &c, 1));
 }
 
@@ -93,6 +94,8 @@ md_buf_putchar(struct md_mbuf *buf, char c)
 int
 md_buf_putstring(struct md_mbuf *buf, const char *p)
 {
+
+	assert(buf);
 	return(md_buf_puts(buf, p, strlen(p)));
 }
 
@@ -141,13 +144,13 @@ md_run_leave(const struct md_args *args, struct md_mbu
 			c = -1;
 		break;
 	default:
-		if ( ! md_exit_valid(data, -1 == c ? 0 : 1))
+		if ( ! md_exit_xml(data, -1 == c ? 0 : 1))
 			c = -1;
 		break;
 	}
 
 	/* Make final flush of buffer. */
-	if ( ! md_buf_flush(mbuf))
+	if (-1 != c && ! md_buf_flush(mbuf))
 		return(-1);
 
 	return(c);
@@ -173,7 +176,7 @@ md_run_enter(const struct md_args *args, struct md_mbu
 		fp = md_line_html4_strict;
 		break;
 	default:
-		fp = md_line_valid;
+		fp = md_line_xml;
 		break;
 	}
 
@@ -207,8 +210,8 @@ again:
 			return(md_run_leave(args, mbuf, rbuf, -1, p));
 		}
 
-		line[pos] = 0;
-		if ( ! (*fp)(p, line, pos))
+		line[(int)pos] = 0;
+		if ( ! (*fp)(p, line))
 			return(md_run_leave(args, mbuf, rbuf, -1, p));
 		rbuf->line++;
 		pos = 0;
@@ -244,8 +247,7 @@ md_run(const struct md_args *args,
 			(args, &mbuf, &rbuf);
 		break;
 	default:
-		data = md_init_valid
-			(args, &mbuf, &rbuf);
+		data = md_init_xml(args, &mbuf, &rbuf);
 		break;
 	}