===================================================================
RCS file: /cvs/mandoc/Attic/dummy.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- mandoc/Attic/dummy.c	2008/11/27 16:54:58	1.9
+++ mandoc/Attic/dummy.c	2008/11/27 17:27:50	1.10
@@ -1,4 +1,4 @@
-/* $Id: dummy.c,v 1.9 2008/11/27 16:54:58 kristaps Exp $ */
+/* $Id: dummy.c,v 1.10 2008/11/27 17:27:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -29,10 +29,11 @@
 #define	strlcat		strncat
 #endif
 
-static	int		md_dummy_blk_in(int);
-static	int		md_dummy_blk_out(int);
-static 	int		md_dummy_text_in(int, int *, char **);
-static	int		md_dummy_text_out(int);
+static	int		md_dummy_blk_in(const struct md_args *, int);
+static	int		md_dummy_blk_out(const struct md_args *, int);
+static 	int		md_dummy_text_in(const struct md_args *, int,
+				int *, char **);
+static	int		md_dummy_text_out(const struct md_args *, int);
 static	int		md_dummy_special(int);
 static	int		md_dummy_head(void);
 static	int		md_dummy_tail(void);
@@ -159,9 +160,12 @@ md_dummy_special(int tok)
 
 
 static int
-md_dummy_blk_in(int tok)
+md_dummy_blk_in(const struct md_args *args, int tok)
 {
 
+	if (args->verbosity < 1)
+		return(1);
+
 	dbg_prologue("blk");
 	(void)strlcat(dbg_line, toknames[tok], sizeof(dbg_line) - 1);
 	dbg_epilogue();
@@ -172,19 +176,25 @@ md_dummy_blk_in(int tok)
 
 
 static int
-md_dummy_blk_out(int tok)
+md_dummy_blk_out(const struct md_args *args, int tok)
 {
 
+	if (args->verbosity < 1)
+		return(1);
+
 	dbg_lvl--;
 	return(1);
 }
 
 
-/* ARGSUSED */
 static int
-md_dummy_text_in(int tok, int *argcp, char **argvp)
+md_dummy_text_in(const struct md_args *args, 
+		int tok, int *argcp, char **argvp)
 {
 
+	if (args->verbosity < 1)
+		return(1);
+
 	dbg_prologue("text");
 	(void)strlcat(dbg_line, toknames[tok], sizeof(dbg_line) - 1);
 	(void)strlcat(dbg_line, " ", sizeof(dbg_line) - 1);
@@ -210,7 +220,7 @@ md_dummy_text_in(int tok, int *argcp, char **argvp)
 
 
 static int
-md_dummy_text_out(int tok)
+md_dummy_text_out(const struct md_args *args, int tok)
 {
 
 	return(1);
@@ -226,6 +236,8 @@ md_dummy_msg(const struct md_args *args, enum roffmsg 
 
 	switch (lvl) {
 	case (ROFF_WARN):
+		if ( ! (MD_WARN_ALL & args->warnings))
+			return;
 		p = "warning";
 		break;
 	case (ROFF_ERROR):
@@ -236,3 +248,4 @@ md_dummy_msg(const struct md_args *args, enum roffmsg 
 	assert(pos >= buf);
 	(void)fprintf(stderr, "%s:%d: %s: %s\n", name, line, p, msg);
 }
+