===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -c -r1.206 -r1.207
*** src/usr.bin/mandoc/mdoc_validate.c	2015/04/20 09:48:19	1.206
--- src/usr.bin/mandoc/mdoc_validate.c	2015/04/23 16:17:04	1.207
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_validate.c,v 1.206 2015/04/20 09:48:19 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_validate.c,v 1.207 2015/04/23 16:17:04 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 960,966 ****
  	if (NULL != mdoc->meta.name)
  		return;
  
! 	mdoc_deroff(&mdoc->meta.name, n);
  
  	if (NULL == mdoc->meta.name)
  		mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
--- 960,966 ----
  	if (NULL != mdoc->meta.name)
  		return;
  
! 	deroff(&mdoc->meta.name, n);
  
  	if (NULL == mdoc->meta.name)
  		mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
***************
*** 1874,1880 ****
  
  	secname = NULL;
  	sec = SEC_CUSTOM;
! 	mdoc_deroff(&secname, mdoc->last);
  	sec = NULL == secname ? SEC_CUSTOM : a2sec(secname);
  
  	/* The NAME should be first. */
--- 1874,1880 ----
  
  	secname = NULL;
  	sec = SEC_CUSTOM;
! 	deroff(&secname, mdoc->last);
  	sec = NULL == secname ? SEC_CUSTOM : a2sec(secname);
  
  	/* The NAME should be first. */
***************
*** 2123,2129 ****
  	}
  
  	datestr = NULL;
! 	mdoc_deroff(&datestr, n);
  	if (mdoc->quick)
  		mdoc->meta.date = datestr;
  	else {
--- 2123,2129 ----
  	}
  
  	datestr = NULL;
! 	deroff(&datestr, n);
  	if (mdoc->quick)
  		mdoc->meta.date = datestr;
  	else {
***************
*** 2258,2264 ****
  
  	free(mdoc->meta.os);
  	mdoc->meta.os = NULL;
! 	mdoc_deroff(&mdoc->meta.os, n);
  	if (mdoc->meta.os)
  		goto out;
  
--- 2258,2264 ----
  
  	free(mdoc->meta.os);
  	mdoc->meta.os = NULL;
! 	deroff(&mdoc->meta.os, n);
  	if (mdoc->meta.os)
  		goto out;