diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-10-25 01:29:37 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-10-25 01:29:37 +0000 |
| commit | fde8edaf53806777e606e04187d60d5b3f26d886 (patch) | |
| tree | a9d2702cbf8a0748931c81c27aa48dda4293c973 /src/backend/regex | |
| parent | b4a57b06486df001e9b4e4350c493e2c15e76380 (diff) | |
| download | postgresql-fde8edaf53806777e606e04187d60d5b3f26d886.tar.gz postgresql-fde8edaf53806777e606e04187d60d5b3f26d886.zip | |
Add do { ... } while (0) to more bad macros.
Diffstat (limited to 'src/backend/regex')
| -rw-r--r-- | src/backend/regex/engine.c | 7 | ||||
| -rw-r--r-- | src/backend/regex/regexec.c | 17 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c index 8bf0ee68954..2d7f4ee92d0 100644 --- a/src/backend/regex/engine.c +++ b/src/backend/regex/engine.c @@ -129,7 +129,12 @@ static int pg_isprint(int c); #ifdef REDEBUG #define SP(t, s, c) print(m, t, s, c, stdout) #define AT(t, p1, p2, s1, s2) at(m, t, p1, p2, s1, s2) -#define NOTE(str) { if (m->eflags®_TRACE) printf("=%s\n", (str)); } +#define NOTE(str) \ +do { \ + if (m->eflags®_TRACE) \ + printf("=%s\n", (str)); \ +} while (0) + #else #define SP(t, s, c) /* nothing */ #define AT(t, p1, p2, s1, s2) /* nothing */ 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)) |