diff options
| author | dankm <dan.mcgregor@usask.ca> | 2021-02-26 15:32:01 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2021-09-22 10:29:09 +0000 |
| commit | 9fce0d7cec501ece2839ae1ef2198e8ae13f8a08 (patch) | |
| tree | 293e2352b62acca68faa090886350bcec2860e85 | |
| parent | f7419feda99979db61a7d24d61c2cfe4ed89e206 (diff) | |
nvi: fix catalog generation
Upstream broke catalog generation with some over-eagre style cleanups.
This brings in my pull request.
Obtained from: https://github.com/lichray/nvi2/pull/88
Differential Revision: https://reviews.freebsd.org/D28594
(cherry picked from commit 888ae5725257c251319f14f31c2e941717b675f2)
| -rw-r--r-- | contrib/nvi/catalog/dump.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/nvi/catalog/dump.c b/contrib/nvi/catalog/dump.c index 8390e5022841..74ab53b2f12c 100644 --- a/contrib/nvi/catalog/dump.c +++ b/contrib/nvi/catalog/dump.c @@ -36,24 +36,24 @@ parse(FILE *fp) { int ch, s1, s2, s3; -#define TESTD(s) do { \ +#define TESTD(s) { \ if ((s = getc(fp)) == EOF) \ return; \ if (!isdigit(s)) \ continue; \ -} while (0) -#define TESTP do { \ +} +#define TESTP { \ if ((ch = getc(fp)) == EOF) \ return; \ if (ch != '|') \ continue; \ -} while (0) -#define MOVEC(t) do { \ +} +#define MOVEC(t) { \ do { \ if ((ch = getc(fp)) == EOF) \ return; \ } while (ch != (t)); \ -} while (0) +} for (;;) { MOVEC('"'); TESTD(s1); |