diff options
| author |   schwarze <schwarze@openbsd.org> | 2010-08-18 01:30:16 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2010-08-18 01:30:16 +0000 |
| commit | e5a40dc63e7a4556d38071faeeec72a76d854ef8 (patch) | |
| tree | c825788ff82bd34f229e142f5e1b07d24a06c921 | |
| parent | Simplify and sync the code and comments for copying the macro name (diff) | |
| download | wireguard-openbsd-e5a40dc63e7a4556d38071faeeec72a76d854ef8.tar.xz wireguard-openbsd-e5a40dc63e7a4556d38071faeeec72a76d854ef8.zip | |
Turn the non-trivial PS_GROWBUF macro into a function.
Don't use MAX, it doesn't exist in the default namespace on Solaris.
From Joerg Sonnenberger, with a critical fix by kristaps@.
| -rw-r--r-- | usr.bin/mandoc/term_ps.c | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/usr.bin/mandoc/term_ps.c b/usr.bin/mandoc/term_ps.c index 5f42db5f082..2505505f098 100644 --- a/usr.bin/mandoc/term_ps.c +++ b/usr.bin/mandoc/term_ps.c @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.8 2010/07/31 21:43:07 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.9 2010/08/18 01:30:16 schwarze Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -353,20 +353,27 @@ static const struct font fonts[TERMFONT__MAX] = { /* 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 +563,7 @@ ps_printf(struct termp *p, const char *fmt, ...) * 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 +587,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; |