From fde8edaf53806777e606e04187d60d5b3f26d886 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 25 Oct 2001 01:29:37 +0000 Subject: Add do { ... } while (0) to more bad macros. --- src/backend/regex/regexec.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/backend/regex/regexec.c') diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c index cb52ad9afe4..b1733a9d40d 100644 --- a/src/backend/regex/regexec.c +++ b/src/backend/regex/regexec.c @@ -114,10 +114,19 @@ static int nope = 0; /* for use in asserts; shuts lint up */ #define ASSIGN(d, s) memcpy(d, s, m->g->nstates) #define EQ(a, b) (memcmp(a, b, m->g->nstates) == 0) #define STATEVARS int vn; char *space -#define STATESETUP(m, nv) { (m)->space = malloc((nv)*(m)->g->nstates); \ - if ((m)->space == NULL) return(REG_ESPACE); \ - (m)->vn = 0; } -#define STATETEARDOWN(m) { free((m)->space); } +#define STATESETUP(m, nv) \ +do { \ + (m)->space = malloc((nv)*(m)->g->nstates); \ + if ((m)->space == NULL) \ + return(REG_ESPACE); \ + (m)->vn = 0; \ +} while (0) + +#define STATETEARDOWN(m) \ +do { \ + free((m)->space); \ +} while (0) + #define SETUP(v) ((v) = &m->space[m->vn++ * m->g->nstates]) #define onestate int #define INIT(o, n) ((o) = (n)) -- cgit v1.2.3