[src/trunk]: src/external/mpl/bind/dist bind: remove non-canonical redundant ...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1b52b8715e20
branches:  trunk
changeset: 954336:1b52b8715e20
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Apr 05 11:29:49 2021 +0000

description:
bind: remove non-canonical redundant CONSTCOND comments

Since lint1/tree.c 1.202 from 2021-01-31, lint no longer needs the
/*CONSTCOND*/ for do-while-0 "loops".

No functional change.

diffstat:

 external/mpl/bind/dist/bin/named/server.c          |  6 +++---
 external/mpl/bind/dist/bin/named/statschannel.c    |  8 ++++----
 external/mpl/bind/dist/lib/dns/cache.c             |  4 ++--
 external/mpl/bind/dist/lib/dns/rbt.c               |  4 ++--
 external/mpl/bind/dist/lib/isc/include/isc/radix.h |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diffs (117 lines):

diff -r 9c385f9e894b -r 1b52b8715e20 external/mpl/bind/dist/bin/named/server.c
--- a/external/mpl/bind/dist/bin/named/server.c Mon Apr 05 11:26:59 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/server.c Mon Apr 05 11:29:49 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: server.c,v 1.13 2021/04/05 11:27:00 rillig Exp $       */
+/*     $NetBSD: server.c,v 1.14 2021/04/05 11:29:49 rillig Exp $       */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -3161,7 +3161,7 @@
                        result = ISC_R_RANGE;                              \
                        goto cleanup;                                      \
                }                                                          \
-       } while (/*CONSTCOND*/ 0)
+       } while (0)
 
 #define CHECK_RRL_RATE(rate, def, max_rate, name)                           \
        do {                                                                \
@@ -3176,7 +3176,7 @@
                        rrl->rate.r = def;                                  \
                }                                                           \
                rrl->rate.scaled = rrl->rate.r;                             \
-       } while (/*CONSTCOND*/ 0)
+       } while (0)
 
 static isc_result_t
 configure_rrl(dns_view_t *view, const cfg_obj_t *config, const cfg_obj_t *map) {
diff -r 9c385f9e894b -r 1b52b8715e20 external/mpl/bind/dist/bin/named/statschannel.c
--- a/external/mpl/bind/dist/bin/named/statschannel.c   Mon Apr 05 11:26:59 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/statschannel.c   Mon Apr 05 11:29:49 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: statschannel.c,v 1.10 2021/04/05 11:27:00 rillig Exp $ */
+/*     $NetBSD: statschannel.c,v 1.11 2021/04/05 11:29:49 rillig Exp $ */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -177,7 +177,7 @@
                xmlrc = (a);        \
                if (xmlrc < 0)      \
                        goto error; \
-       } while(/*CONSTCOND*/0)
+       } while (0)
 
 /*%
  * Mapping arrays to represent statistics counters in the order of our
@@ -2580,7 +2580,7 @@
                result = (m);                \
                if (result != ISC_R_SUCCESS) \
                        goto error;          \
-       } while(/*CONSTCOND*/0)
+       } while (0)
 
 #define CHECKMEM(m)                              \
        do {                                     \
@@ -2588,7 +2588,7 @@
                        result = ISC_R_NOMEMORY; \
                        goto error;              \
                }                                \
-       } while(/*CONSTCOND*/0)
+       } while (0)
 
 static void
 wrap_jsonfree(isc_buffer_t *buffer, void *arg) {
diff -r 9c385f9e894b -r 1b52b8715e20 external/mpl/bind/dist/lib/dns/cache.c
--- a/external/mpl/bind/dist/lib/dns/cache.c    Mon Apr 05 11:26:59 2021 +0000
+++ b/external/mpl/bind/dist/lib/dns/cache.c    Mon Apr 05 11:29:49 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cache.c,v 1.6 2021/04/05 11:27:01 rillig Exp $ */
+/*     $NetBSD: cache.c,v 1.7 2021/04/05 11:29:49 rillig Exp $ */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1430,7 +1430,7 @@
                        result = ISC_R_NOMEMORY; \
                        goto error;              \
                }                                \
-       } while(/*CONSTCOND*/0)
+       } while (0)
 
 isc_result_t
 dns_cache_renderjson(dns_cache_t *cache, void *cstats0) {
diff -r 9c385f9e894b -r 1b52b8715e20 external/mpl/bind/dist/lib/dns/rbt.c
--- a/external/mpl/bind/dist/lib/dns/rbt.c      Mon Apr 05 11:26:59 2021 +0000
+++ b/external/mpl/bind/dist/lib/dns/rbt.c      Mon Apr 05 11:29:49 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbt.c,v 1.8 2021/04/05 11:27:02 rillig Exp $   */
+/*     $NetBSD: rbt.c,v 1.9 2021/04/05 11:29:49 rillig Exp $   */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -772,7 +772,7 @@
                        result = ISC_R_INVALIDFILE; \
                        goto cleanup;               \
                }                                   \
-       } while(/*CONSTCOND*/0)
+       } while (0)
 
 static isc_result_t
 treefix(dns_rbt_t *rbt, void *base, size_t filesize, dns_rbtnode_t *n,
diff -r 9c385f9e894b -r 1b52b8715e20 external/mpl/bind/dist/lib/isc/include/isc/radix.h
--- a/external/mpl/bind/dist/lib/isc/include/isc/radix.h        Mon Apr 05 11:26:59 2021 +0000
+++ b/external/mpl/bind/dist/lib/isc/include/isc/radix.h        Mon Apr 05 11:29:49 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radix.h,v 1.5 2021/02/19 16:42:19 christos Exp $       */
+/*     $NetBSD: radix.h,v 1.6 2021/04/05 11:29:49 rillig Exp $ */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -41,7 +41,7 @@
                        (pt).bitlen = 0;                                 \
                }                                                        \
                isc_refcount_init(&(pt).refcount, 0);                    \
-       } while(/*CONSTCOND*/0)
+       } while (0)
 
 typedef struct isc_prefix {
        isc_mem_t *  mctx;