===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term_ps.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/mandoc/term_ps.c	2010/07/31 21:43:07	1.8
--- src/usr.bin/mandoc/term_ps.c	2010/08/18 01:30:16	1.9
***************
*** 1,4 ****
! /*	$Id: term_ps.c,v 1.8 2010/07/31 21:43:07 schwarze Exp $ */
  /*
   * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: term_ps.c,v 1.9 2010/08/18 01:30:16 schwarze Exp $ */
  /*
   * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 353,373 ****
  
  /* These work the buffer used by the header and footer. */
  #define	PS_BUFSLOP	  128
- #define	PS_GROWBUF(p, sz) \
- 	do if ((p)->engine.ps.psmargcur + (sz) > \
- 			(p)->engine.ps.psmargsz) { \
- 		(p)->engine.ps.psmargsz += /* CONSTCOND */ \
- 			MAX(PS_BUFSLOP, (sz)); \
- 		(p)->engine.ps.psmarg = realloc \
- 			((p)->engine.ps.psmarg,  \
- 			 (p)->engine.ps.psmargsz); \
- 		if (NULL == (p)->engine.ps.psmarg) { \
- 			perror(NULL); \
- 			exit(EXIT_FAILURE); \
- 		} \
- 	} while (/* CONSTCOND */ 0)
  
  
  static	double		  ps_hspan(const struct termp *,
  				const struct roffsu *);
  static	size_t		  ps_width(const struct termp *, char);
--- 353,380 ----
  
  /* These work the buffer used by the header and footer. */
  #define	PS_BUFSLOP	  128
  
+ static void
+ ps_growbuf(struct termp *p, size_t sz)
+ {
+ 	if (p->engine.ps.psmargcur + sz <= p->engine.ps.psmargsz)
+ 		return;
  
+ 	if (sz < PS_BUFSLOP)
+ 		sz = PS_BUFSLOP;
+ 
+ 	p->engine.ps.psmargsz += sz;
+ 
+ 	p->engine.ps.psmarg = realloc
+ 		(p->engine.ps.psmarg,
+ 		 p->engine.ps.psmargsz);
+ 	
+ 	if (NULL == p->engine.ps.psmarg) {
+ 		perror(NULL);
+ 		exit(EXIT_FAILURE);
+ 	}
+ }
+ 
  static	double		  ps_hspan(const struct termp *,
  				const struct roffsu *);
  static	size_t		  ps_width(const struct termp *, char);
***************
*** 556,562 ****
  	 * assumption that will cause pukeage if it's not the case.
  	 */
  
! 	PS_GROWBUF(p, PS_BUFSLOP);
  
  	pos = (int)p->engine.ps.psmargcur;
  	len = vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap);
--- 563,569 ----
  	 * assumption that will cause pukeage if it's not the case.
  	 */
  
! 	ps_growbuf(p, PS_BUFSLOP);
  
  	pos = (int)p->engine.ps.psmargcur;
  	len = vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap);
***************
*** 580,586 ****
  		return;
  	}
  
! 	PS_GROWBUF(p, 2);
  
  	pos = (int)p->engine.ps.psmargcur++;
  	p->engine.ps.psmarg[pos++] = c;
--- 587,593 ----
  		return;
  	}
  
! 	ps_growbuf(p, 2);
  
  	pos = (int)p->engine.ps.psmargcur++;
  	p->engine.ps.psmarg[pos++] = c;