Module Name: src
Committed By: rillig
Date: Mon Apr 5 11:29:49 UTC 2021
Modified Files:
src/external/mpl/bind/dist/bin/named: server.c statschannel.c
src/external/mpl/bind/dist/lib/dns: cache.c rbt.c
src/external/mpl/bind/dist/lib/isc/include/isc: radix.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mpl/bind/dist/bin/named/server.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/mpl/bind/dist/bin/named/statschannel.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/cache.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/dns/rbt.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isc/include/isc/radix.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/bind/dist/bin/named/server.c
diff -u src/external/mpl/bind/dist/bin/named/server.c:1.13 src/external/mpl/bind/dist/bin/named/server.c:1.14
--- src/external/mpl/bind/dist/bin/named/server.c:1.13 Mon Apr 5 11:27:00 2021
+++ src/external/mpl/bind/dist/bin/named/server.c Mon Apr 5 11:29:49 2021
@@ -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 @@ cleanup:
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 @@ cleanup:
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) {
Index: src/external/mpl/bind/dist/bin/named/statschannel.c
diff -u src/external/mpl/bind/dist/bin/named/statschannel.c:1.10 src/external/mpl/bind/dist/bin/named/statschannel.c:1.11
--- src/external/mpl/bind/dist/bin/named/statschannel.c:1.10 Mon Apr 5 11:27:00 2021
+++ src/external/mpl/bind/dist/bin/named/statschannel.c Mon Apr 5 11:29:49 2021
@@ -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 @@ static const char *gluecachestats_xmldes
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 @@ render_xml_traffic(const char *url, isc_
result = (m); \
if (result != ISC_R_SUCCESS) \
goto error; \
- } while(/*CONSTCOND*/0)
+ } while (0)
#define CHECKMEM(m) \
do { \
@@ -2588,7 +2588,7 @@ render_xml_traffic(const char *url, isc_
result = ISC_R_NOMEMORY; \
goto error; \
} \
- } while(/*CONSTCOND*/0)
+ } while (0)
static void
wrap_jsonfree(isc_buffer_t *buffer, void *arg) {
Index: src/external/mpl/bind/dist/lib/dns/cache.c
diff -u src/external/mpl/bind/dist/lib/dns/cache.c:1.6 src/external/mpl/bind/dist/lib/dns/cache.c:1.7
--- src/external/mpl/bind/dist/lib/dns/cache.c:1.6 Mon Apr 5 11:27:01 2021
+++ src/external/mpl/bind/dist/lib/dns/cache.c Mon Apr 5 11:29:49 2021
@@ -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 @@ error:
result = ISC_R_NOMEMORY; \
goto error; \
} \
- } while(/*CONSTCOND*/0)
+ } while (0)
isc_result_t
dns_cache_renderjson(dns_cache_t *cache, void *cstats0) {
Index: src/external/mpl/bind/dist/lib/dns/rbt.c
diff -u src/external/mpl/bind/dist/lib/dns/rbt.c:1.8 src/external/mpl/bind/dist/lib/dns/rbt.c:1.9
--- src/external/mpl/bind/dist/lib/dns/rbt.c:1.8 Mon Apr 5 11:27:02 2021
+++ src/external/mpl/bind/dist/lib/dns/rbt.c Mon Apr 5 11:29:49 2021
@@ -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 @@ cleanup:
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,
Index: src/external/mpl/bind/dist/lib/isc/include/isc/radix.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.5 src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.6
--- src/external/mpl/bind/dist/lib/isc/include/isc/radix.h:1.5 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/radix.h Mon Apr 5 11:29:49 2021
@@ -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;
