Split roff engine into roff.c.

Re-worked calling convention for md_*.

1 files changed, 20 insertions, 20 deletions

diff --git a/private.h b/private.h
index 42c74aeb..72aabe48 100644
--- a/private.h
+++ b/private.h
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.3 2008/11/24 08:50:33 kristaps Exp $ */
+/* $Id: private.h,v 1.4 2008/11/24 14:24:55 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -37,32 +37,32 @@ struct	md_mbuf {
 
 __BEGIN_DECLS
 
-typedef	int	(*md_init)(const struct md_args *, struct md_mbuf *,
-			const struct md_rbuf *, void **);
-typedef	int	(*md_exit)(const struct md_args *, struct md_mbuf *, 
-			const struct md_rbuf *, int, void *);
-typedef	int	(*md_line)(const struct md_args *, 
-			struct md_mbuf *, const struct md_rbuf *, 
-			char *, size_t, void *);
+typedef	void  (*(*md_init)(const struct md_args *, 
+			struct md_mbuf *, const struct md_rbuf *));
+typedef	int	(*md_line)(void *, char *, size_t);
+typedef	int	(*md_exit)(void *, int);
 
-int		  md_line_html4_strict(const struct md_args *,
-			struct md_mbuf *, const struct md_rbuf *,
-			char *, size_t, void *);
-int		  md_init_html4_strict(const struct md_args *, 
-			struct md_mbuf *, const struct md_rbuf *,
-			void **);
-int		  md_exit_html4_strict(const struct md_args *,
-			struct md_mbuf *, const struct md_rbuf *, 
-			int, void *);
+void		 *md_init_html4_strict(const struct md_args *,
+			struct md_mbuf *, const struct md_rbuf *);
+int		  md_line_html4_strict(void *, char *, size_t);
+int		  md_exit_html4_strict(void *, int);
 
-int		  md_line_dummy(const struct md_args *,
-			struct md_mbuf *, const struct md_rbuf *, 
-			char *, size_t, void *);
+void		 *md_init_dummy(const struct md_args *,
+			struct md_mbuf *, const struct md_rbuf *);
+int		  md_line_dummy(void *, char *, size_t);
+int		  md_exit_dummy(void *, int);
 
 int	 	  md_buf_puts(struct md_mbuf *, const char *, size_t);
 int	 	  md_buf_putchar(struct md_mbuf *, char);
 int	 	  md_buf_putstring(struct md_mbuf *, const char *);
 
+struct	rofftree;
+
+struct	rofftree *roff_alloc(const struct md_args *, 
+			struct md_mbuf *, const struct md_rbuf *);
+int		  roff_engine(struct rofftree *, char *, size_t);
+int		  roff_free(struct rofftree *, int);
+
 __END_DECLS
 
 #endif /*!PRIVATE_H*/