===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.39
retrieving revision 1.42
diff -u -p -r1.39 -r1.42
--- mandoc/main.c	2009/07/24 14:00:59	1.39
+++ mandoc/main.c	2009/09/16 09:41:24	1.42
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.39 2009/07/24 14:00:59 kristaps Exp $ */
+/*	$Id: main.c,v 1.42 2009/09/16 09:41:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -40,8 +40,8 @@ extern	int		  getsubopt(char **, char * const *, char 
 # endif
 #endif
 
-typedef	int		(*out_mdoc)(void *, const struct mdoc *);
-typedef	int		(*out_man)(void *, const struct man *);
+typedef	void		(*out_mdoc)(void *, const struct mdoc *);
+typedef	void		(*out_man)(void *, const struct man *);
 typedef	void		(*out_free)(void *);
 
 struct	buf {
@@ -86,10 +86,10 @@ struct	curparse {
 };
 
 extern	void		 *ascii_alloc(void);
-extern	int		  tree_mdoc(void *, const struct mdoc *);
-extern	int		  tree_man(void *, const struct man *);
-extern	int		  terminal_mdoc(void *, const struct mdoc *);
-extern	int		  terminal_man(void *, const struct man *);
+extern	void		  tree_mdoc(void *, const struct mdoc *);
+extern	void		  tree_man(void *, const struct man *);
+extern	void		  terminal_mdoc(void *, const struct mdoc *);
+extern	void		  terminal_man(void *, const struct man *);
 extern	void		  terminal_free(void *);
 
 static	int		  foptions(int *, char *);
@@ -418,7 +418,8 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 	/* NOTE a parser may not have been assigned, yet. */
 
 	if ( ! (man || mdoc)) {
-		warnx("%s: not a manual", curp->file);
+		(void)fprintf(stderr, "%s: not a manual\n", 
+				curp->file);
 		return(0);
 	}
 
@@ -449,11 +450,9 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 	/* Execute the out device, if it exists. */
 
 	if (man && curp->outman)
-		if ( ! (*curp->outman)(curp->outdata, man))
-			return(-1);
+		(*curp->outman)(curp->outdata, man);
 	if (mdoc && curp->outmdoc)
-		if ( ! (*curp->outmdoc)(curp->outdata, mdoc))
-			return(-1);
+		(*curp->outmdoc)(curp->outdata, mdoc);
 
 	return(1);
 }
@@ -639,8 +638,8 @@ merr(void *arg, int line, int col, const char *msg)
 
 	curp = (struct curparse *)arg;
 
-	warnx("%s:%d: error: %s (column %d)", 
-			curp->file, line, msg, col);
+	(void)fprintf(stderr, "%s:%d:%d: error: %s\n", 
+			curp->file, line, col + 1, msg);
 
 	return(0);
 }
@@ -656,13 +655,12 @@ mwarn(void *arg, int line, int col, const char *msg)
 	if ( ! (curp->wflags & WARN_WALL))
 		return(1);
 
-	warnx("%s:%d: warning: %s (column %d)", 
-			curp->file, line, msg, col);
+	(void)fprintf(stderr, "%s:%d:%d: warning: %s\n", 
+			curp->file, line, col + 1, msg);
 
 	if ( ! (curp->wflags & WARN_WERR))
 		return(1);
 	
-	warnx("considering warnings as errors");
 	return(0);
 }