summaryrefslogtreecommitdiff
path: root/src/backend/regex/regexec.c
diff options
context:
space:
mode:
authorBruce Momjian2001-10-25 01:29:37 +0000
committerBruce Momjian2001-10-25 01:29:37 +0000
commitbefa0077cd336da357bd6012f86655958400e237 (patch)
tree871ecccfc0ad206af207d82e8604c9ec4d309ee9 /src/backend/regex/regexec.c
parentd95826ac3b768f6130ee5966e61ec621ca663748 (diff)
Add do { ... } while (0) to more bad macros.
Diffstat (limited to 'src/backend/regex/regexec.c')
-rw-r--r--src/backend/regex/regexec.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index cb52ad9afe..b1733a9d40 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))