===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_validate.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -c -r1.92 -r1.93
*** src/usr.bin/mandoc/man_validate.c	2015/10/22 21:53:49	1.92
--- src/usr.bin/mandoc/man_validate.c	2016/01/08 17:48:04	1.93
***************
*** 1,7 ****
! /*	$OpenBSD: man_validate.c,v 1.92 2015/10/22 21:53:49 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,7 ----
! /*	$OpenBSD: man_validate.c,v 1.93 2016/01/08 17:48:04 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 178,187 ****
  post_OP(CHKARGS)
  {
  
! 	if (n->nchild == 0)
  		mandoc_msg(MANDOCERR_OP_EMPTY, man->parse,
  		    n->line, n->pos, "OP");
! 	else if (n->nchild > 2) {
  		n = n->child->next->next;
  		mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
  		    n->line, n->pos, "OP ... %s", n->string);
--- 178,187 ----
  post_OP(CHKARGS)
  {
  
! 	if (n->child == NULL)
  		mandoc_msg(MANDOCERR_OP_EMPTY, man->parse,
  		    n->line, n->pos, "OP");
! 	else if (n->child->next != NULL && n->child->next->next != NULL) {
  		n = n->child->next->next;
  		mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
  		    n->line, n->pos, "OP ... %s", n->string);
***************
*** 204,210 ****
  	char	*cp;
  	int	 ok;
  
! 	if (0 == n->nchild)
  		return;
  
  	ok = 0;
--- 204,210 ----
  	char	*cp;
  	int	 ok;
  
! 	if (n->child == NULL)
  		return;
  
  	ok = 0;
***************
*** 254,275 ****
  
  	switch (n->type) {
  	case ROFFT_BLOCK:
! 		if (0 == n->body->nchild)
  			roff_node_delete(man, n);
  		break;
  	case ROFFT_BODY:
! 		if (0 == n->nchild)
  			mandoc_vmsg(MANDOCERR_PAR_SKIP,
  			    man->parse, n->line, n->pos,
  			    "%s empty", man_macronames[n->tok]);
  		break;
  	case ROFFT_HEAD:
! 		if (n->nchild)
  			mandoc_vmsg(MANDOCERR_ARG_SKIP,
  			    man->parse, n->line, n->pos,
  			    "%s %s%s", man_macronames[n->tok],
  			    n->child->string,
! 			    n->nchild > 1 ? " ..." : "");
  		break;
  	default:
  		break;
--- 254,275 ----
  
  	switch (n->type) {
  	case ROFFT_BLOCK:
! 		if (n->body->child == NULL)
  			roff_node_delete(man, n);
  		break;
  	case ROFFT_BODY:
! 		if (n->child == NULL)
  			mandoc_vmsg(MANDOCERR_PAR_SKIP,
  			    man->parse, n->line, n->pos,
  			    "%s empty", man_macronames[n->tok]);
  		break;
  	case ROFFT_HEAD:
! 		if (n->child != NULL)
  			mandoc_vmsg(MANDOCERR_ARG_SKIP,
  			    man->parse, n->line, n->pos,
  			    "%s %s%s", man_macronames[n->tok],
  			    n->child->string,
! 			    n->child->next != NULL ? " ..." : "");
  		break;
  	default:
  		break;
***************
*** 282,292 ****
  
  	switch (n->type) {
  	case ROFFT_BLOCK:
! 		if (0 == n->head->nchild && 0 == n->body->nchild)
  			roff_node_delete(man, n);
  		break;
  	case ROFFT_BODY:
! 		if (0 == n->parent->head->nchild && 0 == n->nchild)
  			mandoc_vmsg(MANDOCERR_PAR_SKIP,
  			    man->parse, n->line, n->pos,
  			    "%s empty", man_macronames[n->tok]);
--- 282,292 ----
  
  	switch (n->type) {
  	case ROFFT_BLOCK:
! 		if (n->head->child == NULL && n->body->child == NULL)
  			roff_node_delete(man, n);
  		break;
  	case ROFFT_BODY:
! 		if (n->parent->head->child == NULL && n->child == NULL)
  			mandoc_vmsg(MANDOCERR_PAR_SKIP,
  			    man->parse, n->line, n->pos,
  			    "%s empty", man_macronames[n->tok]);