===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/mandoc/main.c	2009/07/07 00:54:46	1.11
--- src/usr.bin/mandoc/main.c	2009/07/12 18:28:29	1.12
***************
*** 1,4 ****
! /*	$Id: main.c,v 1.11 2009/07/07 00:54:46 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: main.c,v 1.12 2009/07/12 18:28:29 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 85,93 ****
  static	int		  moptions(enum intt *, char *);
  static	int		  woptions(int *, char *);
  static	int		  merr(void *, int, int, const char *);
! static	int		  manwarn(void *, int, int, const char *);
! static	int		  mdocwarn(void *, int, int, 
! 				enum mdoc_warn, const char *);
  static	int		  ffile(struct buf *, struct buf *, 
  				const char *, struct curparse *);
  static	int		  fdesc(struct buf *, struct buf *,
--- 85,91 ----
  static	int		  moptions(enum intt *, char *);
  static	int		  woptions(int *, char *);
  static	int		  merr(void *, int, int, const char *);
! static	int		  mwarn(void *, int, int, const char *);
  static	int		  ffile(struct buf *, struct buf *, 
  				const char *, struct curparse *);
  static	int		  fdesc(struct buf *, struct buf *,
***************
*** 215,221 ****
  	struct man_cb	 mancb;
  
  	mancb.man_err = merr;
! 	mancb.man_warn = manwarn;
  
  	/* Defaults from mandoc.1. */
  
--- 213,219 ----
  	struct man_cb	 mancb;
  
  	mancb.man_err = merr;
! 	mancb.man_warn = mwarn;
  
  	/* Defaults from mandoc.1. */
  
***************
*** 243,249 ****
  	struct mdoc_cb	 mdoccb;
  
  	mdoccb.mdoc_err = merr;
! 	mdoccb.mdoc_warn = mdocwarn;
  
  	/* Defaults from mandoc.1. */
  
--- 241,247 ----
  	struct mdoc_cb	 mdoccb;
  
  	mdoccb.mdoc_err = merr;
! 	mdoccb.mdoc_warn = mwarn;
  
  	/* Defaults from mandoc.1. */
  
***************
*** 632,662 ****
  
  
  static int
! mdocwarn(void *arg, int line, int col, 
! 		enum mdoc_warn type, const char *msg)
  {
  	struct curparse *curp;
- 	char		*wtype;
  
  	curp = (struct curparse *)arg;
- 	wtype = NULL;
  
! 	switch (type) {
! 	case (WARN_COMPAT):
! 		wtype = "compat";
! 		if (curp->wflags & WARN_WCOMPAT)
! 			break;
  		return(1);
- 	case (WARN_SYNTAX):
- 		wtype = "syntax";
- 		if (curp->wflags & WARN_WSYNTAX)
- 			break;
- 		return(1);
- 	}
  
! 	assert(wtype);
! 	warnx("%s:%d: %s warning: %s (column %d)", 
! 			curp->file, line, wtype, msg, col);
  
  	if ( ! (curp->wflags & WARN_WERR))
  		return(1);
--- 630,646 ----
  
  
  static int
! mwarn(void *arg, int line, int col, const char *msg)
  {
  	struct curparse *curp;
  
  	curp = (struct curparse *)arg;
  
! 	if ( ! (curp->wflags & WARN_WALL))
  		return(1);
  
! 	warnx("%s:%d: warning: %s (column %d)", 
! 			curp->file, line, msg, col);
  
  	if ( ! (curp->wflags & WARN_WERR))
  		return(1);
***************
*** 665,687 ****
  	return(0);
  }
  
- 
- static int
- manwarn(void *arg, int line, int col, const char *msg)
- {
- 	struct curparse *curp;
- 
- 	curp = (struct curparse *)arg;
- 
- 	if ( ! (curp->wflags & WARN_WSYNTAX))
- 		return(1);
- 
- 	warnx("%s:%d: syntax warning: %s (column %d)", 
- 			curp->file, line, msg, col);
- 
- 	if ( ! (curp->wflags & WARN_WERR))
- 		return(1);
- 
- 	warnx("considering warnings as errors");
- 	return(0);
- }
--- 649,651 ----