===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -p -r1.3 -r1.6
--- mandoc/read.c	2011/03/20 16:02:05	1.3
+++ mandoc/read.c	2011/03/22 10:35:26	1.6
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.3 2011/03/20 16:02:05 kristaps Exp $ */
+/*	$Id: read.c,v 1.6 2011/03/22 10:35:26 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -31,7 +31,6 @@
 #include "libmandoc.h"
 #include "mdoc.h"
 #include "man.h"
-#include "roff.h"
 
 #ifndef MAP_FILE
 #define	MAP_FILE	0
@@ -58,8 +57,6 @@ struct	mparse {
 	int		  reparse_count; /* finite interp. stack */
 	mandocmsg	  mmsg; /* warning/error message handler */
 	void		 *arg; /* argument to mmsg */
-	mevt_open	  evt_open; /* file-open event */
-	mevt_close	  evt_close; /* file-close event */
 	const char	 *file; 
 };
 
@@ -499,16 +496,11 @@ mparse_end(struct mparse *curp)
 		return;
 	}
 
-#if 0
-	/* FIXME: NOTE a parser may not have been assigned, yet. */
-
 	if ( ! (curp->man || curp->mdoc)) {
-		/* FIXME: make into an mandoc.h error. */
-		fprintf(stderr, "%s: Not a manual\n", curp->file);
+		mandoc_msg(MANDOCERR_NOTMANUAL, curp, 1, 0, NULL);
 		curp->file_status = MANDOCLEVEL_FATAL;
-		goto cleanup;
+		return;
 	}
-#endif
 
 	roff_endparse(curp->roff);
 }
@@ -518,11 +510,6 @@ mparse_readfd_r(struct mparse *curp, int fd, const cha
 {
 	const char	*svfile;
 
-	if ( ! (*curp->evt_open)(curp->arg, file)) {
-		curp->file_status = MANDOCLEVEL_SYSERR;
-		return;
-	}
-
 	if (-1 == fd)
 		if (-1 == (fd = open(file, O_RDONLY, 0))) {
 			perror(file);
@@ -541,7 +528,6 @@ mparse_readfd_r(struct mparse *curp, int fd, const cha
 	if (STDIN_FILENO != fd && -1 == close(fd))
 		perror(file);
 
-	(*curp->evt_close)(curp->arg, file);
 	curp->file = svfile;
 }
 
@@ -554,8 +540,7 @@ mparse_readfd(struct mparse *curp, int fd, const char 
 }
 
 struct mparse *
-mparse_alloc(enum mparset inttype, mevt_open eopen, 
-		mevt_close eclose, enum mandoclevel wlevel, mandocmsg mmsg, void *arg)
+mparse_alloc(enum mparset inttype, enum mandoclevel wlevel, mandocmsg mmsg, void *arg)
 {
 	struct mparse	*curp;
 
@@ -565,8 +550,6 @@ mparse_alloc(enum mparset inttype, mevt_open eopen, 
 	curp->mmsg = mmsg;
 	curp->arg = arg;
 	curp->inttype = inttype;
-	curp->evt_open = eopen;
-	curp->evt_close = eclose;
 
 	curp->roff = roff_alloc(&curp->regs, curp);
 	return(curp);