===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -c -r1.77 -r1.78
*** src/usr.bin/mandoc/mdoc.c	2011/01/04 22:28:17	1.77
--- src/usr.bin/mandoc/mdoc.c	2011/01/09 13:16:48	1.78
***************
*** 1,4 ****
! /*	$Id: mdoc.c,v 1.77 2011/01/04 22:28:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc.c,v 1.78 2011/01/09 13:16:48 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 102,108 ****
  mdoc_node(const struct mdoc *m)
  {
  
! 	return(MDOC_HALT & m->flags ? NULL : m->first);
  }
  
  
--- 102,109 ----
  mdoc_node(const struct mdoc *m)
  {
  
! 	assert( ! (MDOC_HALT & m->flags));
! 	return(m->first);
  }
  
  
***************
*** 110,116 ****
  mdoc_meta(const struct mdoc *m)
  {
  
! 	return(MDOC_HALT & m->flags ? NULL : &m->meta);
  }
  
  
--- 111,118 ----
  mdoc_meta(const struct mdoc *m)
  {
  
! 	assert( ! (MDOC_HALT & m->flags));
! 	return(&m->meta);
  }
  
  
***************
*** 211,219 ****
  mdoc_endparse(struct mdoc *m)
  {
  
! 	if (MDOC_HALT & m->flags)
! 		return(0);
! 	else if (mdoc_macroend(m))
  		return(1);
  	m->flags |= MDOC_HALT;
  	return(0);
--- 213,220 ----
  mdoc_endparse(struct mdoc *m)
  {
  
! 	assert( ! (MDOC_HALT & m->flags));
! 	if (mdoc_macroend(m))
  		return(1);
  	m->flags |= MDOC_HALT;
  	return(0);
***************
*** 223,230 ****
  mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
  {
  
! 	if (MDOC_HALT & m->flags)
! 		return(0);
  
  	/* No text before an initial macro. */
  
--- 224,230 ----
  mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
  {
  
! 	assert( ! (MDOC_HALT & m->flags));
  
  	/* No text before an initial macro. */
  
***************
*** 246,253 ****
  mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
  {
  
! 	if (MDOC_HALT & m->flags)
! 		return(0);
  
  	m->flags |= MDOC_NEWLINE;
  
--- 246,252 ----
  mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
  {
  
! 	assert( ! (MDOC_HALT & m->flags));
  
  	m->flags |= MDOC_NEWLINE;