git: 888ae5725257 - main - nvi: fix catalog generation
Baptiste Daroussin
bapt at FreeBSD.org
Fri Feb 26 15:33:36 UTC 2021
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=888ae5725257c251319f14f31c2e941717b675f2
commit 888ae5725257c251319f14f31c2e941717b675f2
Author: dankm <dan.mcgregor at usask.ca>
AuthorDate: 2021-02-26 15:32:01 +0000
Commit: Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-02-26 15:32:01 +0000
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
---
contrib/nvi/catalog/dump.c | 12 ++++++------
1 file 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);
More information about the dev-commits-src-main
mailing list