===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/mandoc/mdoc_macro.c	2009/07/12 21:45:44	1.9
--- src/usr.bin/mandoc/mdoc_macro.c	2009/07/12 22:35:08	1.10
***************
*** 1,4 ****
! /*	$Id: mdoc_macro.c,v 1.9 2009/07/12 21:45:44 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mdoc_macro.c,v 1.10 2009/07/12 22:35:08 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 22,34 ****
  
  #include "libmdoc.h"
  
- enum	mwarn {
- 	WIGNE,
- 	WIMPBRK,
- 	WMACPARM,
- 	WOBS
- };
- 
  #define	REWIND_REWIND	(1 << 0)
  #define	REWIND_NOHALT	(1 << 1)
  #define	REWIND_HALT	(1 << 2)
--- 22,27 ----
***************
*** 55,61 ****
  static	int	  rew_last(struct mdoc *, struct mdoc_node *);
  static	int	  append_delims(struct mdoc *, int, int *, char *);
  static	int	  lookup(struct mdoc *, int, int, int, const char *);
- static	int	  pwarn(struct mdoc *, int, int, enum mwarn);
  static	int	  swarn(struct mdoc *, enum mdoc_type, int, int, 
  			const struct mdoc_node *);
  
--- 48,53 ----
***************
*** 186,216 ****
  
  
  static int
- pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn type)
- {
- 	char		*p;
- 
- 	p = NULL;
- 	switch (type) {
- 	case (WIGNE):
- 		p = "ignoring empty element";
- 		break;
- 	case (WIMPBRK):
- 		p = "crufty end-of-line scope violation";
- 		break;
- 	case (WMACPARM):
- 		p = "macro-like parameter";
- 		break;
- 	case (WOBS):
- 		p = "macro marked obsolete";
- 		break;
- 	}
- 	assert(p);
- 	return(mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, p));
- }
- 
- 
- static int
  swarn(struct mdoc *mdoc, enum mdoc_type type, 
  		int line, int pos, const struct mdoc_node *p)
  {
--- 178,183 ----
***************
*** 293,299 ****
  		return(res);
  	if (MDOC_MAX == res)
  		return(res);
! 	if ( ! pwarn(mdoc, line, pos, WMACPARM))
  		return(-1);
  	return(MDOC_MAX);
  }
--- 260,266 ----
  		return(res);
  	if (MDOC_MAX == res)
  		return(res);
! 	if ( ! mdoc_pwarn(mdoc, line, pos, EMACPARM))
  		return(-1);
  	return(MDOC_MAX);
  }
***************
*** 836,842 ****
  					return(0);
  			} else if ( ! nc && 0 == cnt) {
  				mdoc_argv_free(arg);
! 				if ( ! pwarn(mdoc, line, ppos, WIGNE))
  					return(0);
  			}
  			c = mdoc_macro(mdoc, c, line, la, pos, buf);
--- 803,809 ----
  					return(0);
  			} else if ( ! nc && 0 == cnt) {
  				mdoc_argv_free(arg);
! 				if ( ! mdoc_pwarn(mdoc, line, ppos, EIGNE))
  					return(0);
  			}
  			c = mdoc_macro(mdoc, c, line, la, pos, buf);
***************
*** 892,898 ****
  			return(0);
  	} else if ( ! nc && 0 == cnt) {
  		mdoc_argv_free(arg);
! 		if ( ! pwarn(mdoc, line, ppos, WIGNE))
  			return(0);
  	}
  
--- 859,865 ----
  			return(0);
  	} else if ( ! nc && 0 == cnt) {
  		mdoc_argv_free(arg);
! 		if ( ! mdoc_pwarn(mdoc, line, ppos, EIGNE))
  			return(0);
  	}
  
***************
*** 1076,1082 ****
  		if (body == n)
  			break;
  
! 	if (NULL == n && ! pwarn(mdoc, body->line, body->pos, WIMPBRK))
  			return(0);
  
  	if (n && ! rew_last(mdoc, body))
--- 1043,1049 ----
  		if (body == n)
  			break;
  
! 	if (NULL == n && ! mdoc_nwarn(mdoc, body, EIMPBRK))
  			return(0);
  
  	if (n && ! rew_last(mdoc, body))
***************
*** 1379,1385 ****
  obsolete(MACRO_PROT_ARGS)
  {
  
! 	return(pwarn(mdoc, line, ppos, WOBS));
  }
  
  
--- 1346,1352 ----
  obsolete(MACRO_PROT_ARGS)
  {
  
! 	return(mdoc_pwarn(mdoc, line, ppos, EOBS));
  }