From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (joerg@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id o71FkJPS024342
	for <source@mdocml.bsd.lv>; Sun, 1 Aug 2010 11:46:19 -0400 (EDT)
Received: (from joerg@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id o71FkI6W008186;
	Sun, 1 Aug 2010 11:46:18 -0400 (EDT)
Date: Sun, 1 Aug 2010 11:46:18 -0400 (EDT)
Message-Id: <201008011546.o71FkI6W008186@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: joerg@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Turn the non-trivial PS_GROWBUF macro into a function.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Turn the non-trivial PS_GROWBUF macro into a function. Don't use MAX, it
doesn't exist in the default namespace on Solaris.

Modified Files:
--------------
    mdocml:
        term_ps.c

Revision Data
-------------
Index: term_ps.c
===================================================================
RCS file: /home/joerg/cvsroot/mdocml/term_ps.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -Lterm_ps.c -Lterm_ps.c -u -p -r1.39 -r1.40
--- term_ps.c
+++ term_ps.c
@@ -353,20 +353,23 @@ static	const struct font fonts[TERMFONT_
 
 /* 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 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 *);
@@ -556,7 +559,7 @@ ps_printf(struct termp *p, const char *f
 	 * assumption that will cause pukeage if it's not the case.
 	 */
 
-	PS_GROWBUF(p, PS_BUFSLOP);
+	ps_growbuf(p, PS_BUFSLOP);
 
 	pos = (int)p->engine.ps.psmargcur;
 	len = vsnprintf(&p->engine.ps.psmarg[pos], PS_BUFSLOP, fmt, ap);
@@ -580,7 +583,7 @@ ps_putchar(struct termp *p, char c)
 		return;
 	}
 
-	PS_GROWBUF(p, 2);
+	ps_growbuf(p, 2);
 
 	pos = (int)p->engine.ps.psmargcur++;
 	p->engine.ps.psmarg[pos++] = c;
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv