Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Sep 2021 10:31:07 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 9fce0d7cec50 - stable/12 - nvi: fix catalog generation
Message-ID:  <202109221031.18MAV7Pw009314@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=9fce0d7cec501ece2839ae1ef2198e8ae13f8a08

commit 9fce0d7cec501ece2839ae1ef2198e8ae13f8a08
Author:     dankm <dan.mcgregor@usask.ca>
AuthorDate: 2021-02-26 15:32:01 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2021-09-22 10:29:09 +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
    
    (cherry picked from commit 888ae5725257c251319f14f31c2e941717b675f2)
---
 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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109221031.18MAV7Pw009314>