===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_term.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/mandoc/man_term.c	2009/09/21 20:28:43	1.15
--- src/usr.bin/mandoc/man_term.c	2009/09/21 20:57:57	1.16
***************
*** 1,4 ****
! /*	$Id: man_term.c,v 1.15 2009/09/21 20:28:43 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: man_term.c,v 1.16 2009/09/21 20:57:57 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 136,150 ****
  static	int		  arg_width(const struct man_node *);
  
  
! int
  man_run(struct termp *p, const struct man *m)
  {
  	struct mtermp	 mt;
  
  	print_head(p, man_meta(m));
  	p->flags |= TERMP_NOSPACE;
- 	assert(man_node(m));
- 	assert(MAN_ROOT == man_node(m)->type);
  
  	mt.fl = 0;
  	mt.lmargin = INDENT;
--- 136,148 ----
  static	int		  arg_width(const struct man_node *);
  
  
! void
  man_run(struct termp *p, const struct man *m)
  {
  	struct mtermp	 mt;
  
  	print_head(p, man_meta(m));
  	p->flags |= TERMP_NOSPACE;
  
  	mt.fl = 0;
  	mt.lmargin = INDENT;
***************
*** 153,160 ****
  	if (man_node(m)->child)
  		print_body(p, &mt, man_node(m)->child, man_meta(m));
  	print_foot(p, man_meta(m));
- 
- 	return(1);
  }
  
  
--- 151,156 ----
***************
*** 921,932 ****
  	char		*buf;
  
  	if (NULL == (buf = malloc(p->rmargin)))
! 		err(1, "malloc");
  
  	tm = localtime(&meta->date);
  
  	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
! 		err(1, "strftime");
  
  	term_vspace(p);
  
--- 917,928 ----
  	char		*buf;
  
  	if (NULL == (buf = malloc(p->rmargin)))
! 		err(EXIT_FAILURE, "malloc");
  
  	tm = localtime(&meta->date);
  
  	if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
! 		err(EXIT_FAILURE, "strftime");
  
  	term_vspace(p);
  
***************
*** 961,969 ****
  	p->offset = 0;
  
  	if (NULL == (buf = malloc(p->rmargin)))
! 		err(1, "malloc");
  	if (NULL == (title = malloc(p->rmargin)))
! 		err(1, "malloc");
  
  	if (meta->vol)
  		(void)strlcpy(buf, meta->vol, p->rmargin);
--- 957,965 ----
  	p->offset = 0;
  
  	if (NULL == (buf = malloc(p->rmargin)))
! 		err(EXIT_FAILURE, "malloc");
  	if (NULL == (title = malloc(p->rmargin)))
! 		err(EXIT_FAILURE, "malloc");
  
  	if (meta->vol)
  		(void)strlcpy(buf, meta->vol, p->rmargin);