Module Name: src
Committed By: rillig
Date: Mon Apr 5 11:27:04 UTC 2021
Modified Files:
src/external/mpl/bind/dist/bin/check: check-tool.c named-checkconf.c
named-checkzone.c
src/external/mpl/bind/dist/bin/confgen: util.h
src/external/mpl/bind/dist/bin/delv: delv.c
src/external/mpl/bind/dist/bin/dig: dig.c
src/external/mpl/bind/dist/bin/named: controlconf.c logconf.c server.c
statschannel.c tkeyconf.c zoneconf.c
src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c
src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c
src/external/mpl/bind/dist/bin/rndc: util.h
src/external/mpl/bind/dist/bin/tests: makejournal.c
src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c
src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c
src/external/mpl/bind/dist/contrib/dlz/example: dlz_example.c
src/external/mpl/bind/dist/contrib/dlz/modules/include: dlz_list.h
src/external/mpl/bind/dist/lib/bind9: check.c
src/external/mpl/bind/dist/lib/dns: adb.c cache.c client.c diff.c
dnssec.c dnstap.c dst_api.c dst_parse.c dyndb.c gen.c gssapi_link.c
gssapictx.c journal.c keymgr.c master.c masterdump.c message.c
name.c nsec.c nsec3.c private.c rbt.c rbtdb.c rcode.c rdata.c
resolver.c sdb.c sdlz.c spnego_asn1.c time.c timer.c tkey.c ttl.c
update.c view.c xfrin.c zone.c
src/external/mpl/bind/dist/lib/dns/include/dns: name.h
src/external/mpl/bind/dist/lib/dns/rdata: rdatastructpre.h
src/external/mpl/bind/dist/lib/dns/rdata/in_1: wks_11.c
src/external/mpl/bind/dist/lib/dns/tests: dnstest.c tsig_test.c
src/external/mpl/bind/dist/lib/irs: getnameinfo.c
src/external/mpl/bind/dist/lib/isc: base32.c base64.c hex.c mem.c
regex.c task.c
src/external/mpl/bind/dist/lib/isc/include/isc: buffer.h event.h list.h
mem.h region.h util.h
src/external/mpl/bind/dist/lib/isc/pthreads: mutex.c
src/external/mpl/bind/dist/lib/isc/tests: isctest.h
src/external/mpl/bind/dist/lib/isc/unix: socket.c
src/external/mpl/bind/dist/lib/isc/win32: ntgroups.c socket.c
src/external/mpl/bind/dist/lib/isc/win32/include/isc: mutex.h net.h
src/external/mpl/bind/dist/lib/isccc/include/isccc: util.h
src/external/mpl/bind/dist/lib/isccfg: namedconf.c parser.c
src/external/mpl/bind/dist/lib/isccfg/tests: duration_test.c
parser_test.c
src/external/mpl/bind/dist/lib/ns: hooks.c query.c server.c update.c
xfrout.c
src/external/mpl/bind/dist/lib/ns/tests: nstest.h
Log Message:
bind: remove unnecessary 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.6 -r1.7 src/external/mpl/bind/dist/bin/check/check-tool.c \
src/external/mpl/bind/dist/bin/check/named-checkconf.c \
src/external/mpl/bind/dist/bin/check/named-checkzone.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/confgen/util.h
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/bin/delv/delv.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/dig/dig.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/named/controlconf.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/logconf.c \
src/external/mpl/bind/dist/bin/named/tkeyconf.c
cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/bin/named/server.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/bin/named/statschannel.c \
src/external/mpl/bind/dist/bin/named/zoneconf.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/bin/named/unix/os.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/bin/rndc/util.h
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/tests/makejournal.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/contrib/dlz/example/dlz_example.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/bind9/check.c
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/dist/lib/dns/adb.c \
src/external/mpl/bind/dist/lib/dns/dnssec.c \
src/external/mpl/bind/dist/lib/dns/dyndb.c \
src/external/mpl/bind/dist/lib/dns/gen.c \
src/external/mpl/bind/dist/lib/dns/master.c \
src/external/mpl/bind/dist/lib/dns/nsec3.c \
src/external/mpl/bind/dist/lib/dns/rbt.c \
src/external/mpl/bind/dist/lib/dns/spnego_asn1.c \
src/external/mpl/bind/dist/lib/dns/ttl.c \
src/external/mpl/bind/dist/lib/dns/xfrin.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/dns/cache.c \
src/external/mpl/bind/dist/lib/dns/diff.c \
src/external/mpl/bind/dist/lib/dns/private.c \
src/external/mpl/bind/dist/lib/dns/time.c \
src/external/mpl/bind/dist/lib/dns/timer.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/dns/client.c \
src/external/mpl/bind/dist/lib/dns/dst_api.c \
src/external/mpl/bind/dist/lib/dns/name.c \
src/external/mpl/bind/dist/lib/dns/rcode.c \
src/external/mpl/bind/dist/lib/dns/sdb.c \
src/external/mpl/bind/dist/lib/dns/sdlz.c \
src/external/mpl/bind/dist/lib/dns/tkey.c \
src/external/mpl/bind/dist/lib/dns/update.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/dns/dnstap.c \
src/external/mpl/bind/dist/lib/dns/masterdump.c \
src/external/mpl/bind/dist/lib/dns/rdata.c \
src/external/mpl/bind/dist/lib/dns/view.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/dst_parse.c \
src/external/mpl/bind/dist/lib/dns/gssapi_link.c \
src/external/mpl/bind/dist/lib/dns/gssapictx.c \
src/external/mpl/bind/dist/lib/dns/journal.c \
src/external/mpl/bind/dist/lib/dns/nsec.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/bind/dist/lib/dns/keymgr.c
cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/dns/message.c \
src/external/mpl/bind/dist/lib/dns/rbtdb.c \
src/external/mpl/bind/dist/lib/dns/resolver.c
cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/lib/dns/zone.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/mpl/bind/dist/lib/dns/include/dns/name.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/dns/tests/dnstest.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/dns/tests/tsig_test.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/irs/getnameinfo.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/base32.c \
src/external/mpl/bind/dist/lib/isc/base64.c \
src/external/mpl/bind/dist/lib/isc/hex.c
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/dist/lib/isc/mem.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/regex.c
cvs rdiff -u -r1.12 -r1.13 src/external/mpl/bind/dist/lib/isc/task.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isc/include/isc/buffer.h \
src/external/mpl/bind/dist/lib/isc/include/isc/list.h \
src/external/mpl/bind/dist/lib/isc/include/isc/mem.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/mpl/bind/dist/lib/isc/include/isc/event.h \
src/external/mpl/bind/dist/lib/isc/include/isc/region.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/mpl/bind/dist/lib/isc/include/isc/util.h
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/pthreads/mutex.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/isc/tests/isctest.h
cvs rdiff -u -r1.21 -r1.22 src/external/mpl/bind/dist/lib/isc/unix/socket.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/isc/win32/ntgroups.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/isc/win32/socket.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h \
src/external/mpl/bind/dist/lib/isc/win32/include/isc/net.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/mpl/bind/dist/lib/isccc/include/isccc/util.h
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/isccfg/namedconf.c
cvs rdiff -u -r1.10 -r1.11 src/external/mpl/bind/dist/lib/isccfg/parser.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/mpl/bind/dist/lib/isccfg/tests/duration_test.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/mpl/bind/dist/lib/isccfg/tests/parser_test.c
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/dist/lib/ns/hooks.c
cvs rdiff -u -r1.11 -r1.12 src/external/mpl/bind/dist/lib/ns/query.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/ns/server.c
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/bind/dist/lib/ns/update.c \
src/external/mpl/bind/dist/lib/ns/xfrout.c
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/lib/ns/tests/nstest.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/check/check-tool.c
diff -u src/external/mpl/bind/dist/bin/check/check-tool.c:1.6 src/external/mpl/bind/dist/bin/check/check-tool.c:1.7
--- src/external/mpl/bind/dist/bin/check/check-tool.c:1.6 Fri Feb 19 16:42:09 2021
+++ src/external/mpl/bind/dist/bin/check/check-tool.c Mon Apr 5 11:26:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: check-tool.c,v 1.6 2021/02/19 16:42:09 christos Exp $ */
+/* $NetBSD: check-tool.c,v 1.7 2021/04/05 11:26:59 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -67,7 +67,7 @@
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ERR_IS_CNAME 1
#define ERR_NO_ADDRESSES 2
Index: src/external/mpl/bind/dist/bin/check/named-checkconf.c
diff -u src/external/mpl/bind/dist/bin/check/named-checkconf.c:1.6 src/external/mpl/bind/dist/bin/check/named-checkconf.c:1.7
--- src/external/mpl/bind/dist/bin/check/named-checkconf.c:1.6 Fri Feb 19 16:42:09 2021
+++ src/external/mpl/bind/dist/bin/check/named-checkconf.c Mon Apr 5 11:26:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: named-checkconf.c,v 1.6 2021/02/19 16:42:09 christos Exp $ */
+/* $NetBSD: named-checkconf.c,v 1.7 2021/04/05 11:26:59 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -55,7 +55,7 @@ isc_log_t *logc = NULL;
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*% usage */
ISC_PLATFORM_NORETURN_PRE static void
Index: src/external/mpl/bind/dist/bin/check/named-checkzone.c
diff -u src/external/mpl/bind/dist/bin/check/named-checkzone.c:1.6 src/external/mpl/bind/dist/bin/check/named-checkzone.c:1.7
--- src/external/mpl/bind/dist/bin/check/named-checkzone.c:1.6 Fri Feb 19 16:42:09 2021
+++ src/external/mpl/bind/dist/bin/check/named-checkzone.c Mon Apr 5 11:26:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: named-checkzone.c,v 1.6 2021/02/19 16:42:09 christos Exp $ */
+/* $NetBSD: named-checkzone.c,v 1.7 2021/04/05 11:26:59 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -62,7 +62,7 @@ static enum { progmode_check, progmode_c
function, dns_result_totext(result)); \
return (result); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
ISC_PLATFORM_NORETURN_PRE static void
usage(void) ISC_PLATFORM_NORETURN_POST;
Index: src/external/mpl/bind/dist/bin/confgen/util.h
diff -u src/external/mpl/bind/dist/bin/confgen/util.h:1.4 src/external/mpl/bind/dist/bin/confgen/util.h:1.5
--- src/external/mpl/bind/dist/bin/confgen/util.h:1.4 Fri Feb 19 16:42:09 2021
+++ src/external/mpl/bind/dist/bin/confgen/util.h Mon Apr 5 11:26:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.4 2021/02/19 16:42:09 christos Exp $ */
+/* $NetBSD: util.h,v 1.5 2021/04/05 11:26:59 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -28,7 +28,7 @@
result = function; \
if (result != ISC_R_SUCCESS) \
fatal("%s: %s", name, isc_result_totext(result)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
ISC_LANG_BEGINDECLS
Index: src/external/mpl/bind/dist/bin/delv/delv.c
diff -u src/external/mpl/bind/dist/bin/delv/delv.c:1.8 src/external/mpl/bind/dist/bin/delv/delv.c:1.9
--- src/external/mpl/bind/dist/bin/delv/delv.c:1.8 Fri Feb 19 16:42:09 2021
+++ src/external/mpl/bind/dist/bin/delv/delv.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: delv.c,v 1.8 2021/02/19 16:42:09 christos Exp $ */
+/* $NetBSD: delv.c,v 1.9 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -81,7 +81,7 @@
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define MAXNAME (DNS_NAME_MAXTEXT + 1)
@@ -1096,7 +1096,7 @@ plus_option(char *option) {
size_t _l = strlen(cmd); \
if (_l >= sizeof(A) || strncasecmp(cmd, A, _l) != 0) \
goto invalid_option; \
- } while (/*CONSTCOND*/0)
+ } while (0)
switch (cmd[0]) {
case 'a': /* all */
Index: src/external/mpl/bind/dist/bin/dig/dig.c
diff -u src/external/mpl/bind/dist/bin/dig/dig.c:1.6 src/external/mpl/bind/dist/bin/dig/dig.c:1.7
--- src/external/mpl/bind/dist/bin/dig/dig.c:1.6 Fri Feb 19 16:42:09 2021
+++ src/external/mpl/bind/dist/bin/dig/dig.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dig.c,v 1.6 2021/02/19 16:42:09 christos Exp $ */
+/* $NetBSD: dig.c,v 1.7 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -984,14 +984,14 @@ plus_option(char *option, bool is_batchf
size_t _l = strlen(cmd); \
if (_l >= sizeof(A) || strncasecmp(cmd, A, _l) != 0) \
goto invalid_option; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FULLCHECK2(A, B) \
do { \
size_t _l = strlen(cmd); \
if ((_l >= sizeof(A) || strncasecmp(cmd, A, _l) != 0) && \
(_l >= sizeof(B) || strncasecmp(cmd, B, _l) != 0)) \
goto invalid_option; \
- } while (/*CONSTCOND*/0)
+ } while (0)
switch (cmd[0]) {
case 'a':
Index: src/external/mpl/bind/dist/bin/named/controlconf.c
diff -u src/external/mpl/bind/dist/bin/named/controlconf.c:1.6 src/external/mpl/bind/dist/bin/named/controlconf.c:1.7
--- src/external/mpl/bind/dist/bin/named/controlconf.c:1.6 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/controlconf.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: controlconf.c,v 1.6 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: controlconf.c,v 1.7 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -852,7 +852,7 @@ register_keys(const cfg_obj_t *control,
result = (x); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
static isc_result_t
get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
Index: src/external/mpl/bind/dist/bin/named/logconf.c
diff -u src/external/mpl/bind/dist/bin/named/logconf.c:1.5 src/external/mpl/bind/dist/bin/named/logconf.c:1.6
--- src/external/mpl/bind/dist/bin/named/logconf.c:1.5 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/logconf.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: logconf.c,v 1.5 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: logconf.c,v 1.6 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -36,7 +36,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Set up a logging category according to the named.conf data
Index: src/external/mpl/bind/dist/bin/named/tkeyconf.c
diff -u src/external/mpl/bind/dist/bin/named/tkeyconf.c:1.5 src/external/mpl/bind/dist/bin/named/tkeyconf.c:1.6
--- src/external/mpl/bind/dist/bin/named/tkeyconf.c:1.5 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/tkeyconf.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tkeyconf.c,v 1.5 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: tkeyconf.c,v 1.6 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -35,7 +35,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#include <named/log.h>
#define LOG(msg) \
Index: src/external/mpl/bind/dist/bin/named/server.c
diff -u src/external/mpl/bind/dist/bin/named/server.c:1.12 src/external/mpl/bind/dist/bin/named/server.c:1.13
--- src/external/mpl/bind/dist/bin/named/server.c:1.12 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/server.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.12 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: server.c,v 1.13 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -173,7 +173,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define TCHECK(op) \
do { \
@@ -182,7 +182,7 @@
isc_buffer_clear(*text); \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECKM(op, msg) \
do { \
@@ -194,7 +194,7 @@
isc_result_totext(result)); \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECKMF(op, msg, file) \
do { \
@@ -206,14 +206,14 @@
isc_result_totext(result)); \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECKFATAL(op, msg) \
do { \
result = (op); \
if (result != ISC_R_SUCCESS) \
fatal(server, msg, result); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Maximum ADB size for views that share a cache. Use this limit to suppress
Index: src/external/mpl/bind/dist/bin/named/statschannel.c
diff -u src/external/mpl/bind/dist/bin/named/statschannel.c:1.9 src/external/mpl/bind/dist/bin/named/statschannel.c:1.10
--- src/external/mpl/bind/dist/bin/named/statschannel.c:1.9 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/statschannel.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: statschannel.c,v 1.9 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: statschannel.c,v 1.10 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -234,7 +234,7 @@ init_desc(void) {
set_desc(ns_statscounter_##counterid, ns_statscounter_max, \
desc, nsstats_desc, xmldesc, nsstats_xmldesc); \
nsstats_index[i++] = ns_statscounter_##counterid; \
- } while (/*CONSTCOND*/0)
+ } while (0)
i = 0;
SET_NSSTATDESC(requestv4, "IPv4 requests received", "Requestv4");
@@ -356,7 +356,7 @@ init_desc(void) {
dns_resstatscounter_max, desc, resstats_desc, \
xmldesc, resstats_xmldesc); \
resstats_index[i++] = dns_resstatscounter_##counterid; \
- } while (/*CONSTCOND*/0)
+ } while (0)
i = 0;
SET_RESSTATDESC(queryv4, "IPv4 queries sent", "Queryv4");
@@ -446,7 +446,7 @@ init_desc(void) {
set_desc(dns_adbstats_##id, dns_adbstats_max, desc, \
adbstats_desc, xmldesc, adbstats_xmldesc); \
adbstats_index[i++] = dns_adbstats_##id; \
- } while (/*CONSTCOND*/0)
+ } while (0)
i = 0;
SET_ADBSTATDESC(nentries, "Address hash table size", "nentries");
SET_ADBSTATDESC(entriescnt, "Addresses in hash table", "entriescnt");
@@ -471,7 +471,7 @@ init_desc(void) {
dns_zonestatscounter_max, desc, zonestats_desc, \
xmldesc, zonestats_xmldesc); \
zonestats_index[i++] = dns_zonestatscounter_##counterid; \
- } while (/*CONSTCOND*/0)
+ } while (0)
i = 0;
SET_ZONESTATDESC(notifyoutv4, "IPv4 notifies sent", "NotifyOutv4");
@@ -506,7 +506,7 @@ init_desc(void) {
isc_sockstatscounter_max, desc, sockstats_desc, \
xmldesc, sockstats_xmldesc); \
sockstats_index[i++] = isc_sockstatscounter_##counterid; \
- } while (/*CONSTCOND*/0)
+ } while (0)
i = 0;
SET_SOCKSTATDESC(udp4open, "UDP/IPv4 sockets opened", "UDP4Open");
@@ -627,7 +627,7 @@ init_desc(void) {
desc, dnssecstats_desc, xmldesc, \
dnssecstats_xmldesc); \
dnssecstats_index[i++] = dns_dnssecstats_##counterid; \
- } while (/*CONSTCOND*/0)
+ } while (0)
i = 0;
SET_DNSSECSTATDESC(asis,
Index: src/external/mpl/bind/dist/bin/named/zoneconf.c
diff -u src/external/mpl/bind/dist/bin/named/zoneconf.c:1.9 src/external/mpl/bind/dist/bin/named/zoneconf.c:1.10
--- src/external/mpl/bind/dist/bin/named/zoneconf.c:1.9 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/zoneconf.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zoneconf.c,v 1.9 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: zoneconf.c,v 1.10 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -67,14 +67,14 @@ typedef enum {
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECK(x) \
do { \
result = (x); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Convenience function for configuring a single zone ACL.
Index: src/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c
diff -u src/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c:1.8 src/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c:1.9
--- src/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c:1.8 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dlz_dlopen_driver.c,v 1.8 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: dlz_dlopen_driver.c,v 1.9 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -69,14 +69,14 @@ typedef struct dlopen_data {
if ((cd->flags & DNS_SDLZFLAG_THREADSAFE) == 0 && \
!cd->in_configure) \
LOCK(&cd->lock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define MAYBE_UNLOCK(cd) \
do { \
if ((cd->flags & DNS_SDLZFLAG_THREADSAFE) == 0 && \
!cd->in_configure) \
UNLOCK(&cd->lock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* Log a message at the given level.
Index: src/external/mpl/bind/dist/bin/named/unix/os.c
diff -u src/external/mpl/bind/dist/bin/named/unix/os.c:1.6 src/external/mpl/bind/dist/bin/named/unix/os.c:1.7
--- src/external/mpl/bind/dist/bin/named/unix/os.c:1.6 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/unix/os.c Mon Apr 5 11:27:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: os.c,v 1.6 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: os.c,v 1.7 2021/04/05 11:27:00 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -111,7 +111,7 @@ linux_setcaps(cap_t caps) {
strbuf); \
} \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define INIT_CAP \
do { \
caps = cap_init(); \
@@ -125,12 +125,12 @@ linux_setcaps(cap_t caps) {
named_main_earlyfatal("cap_get_proc failed: %s", \
strbuf); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FREE_CAP \
do { \
cap_free(caps); \
cap_free(curcaps); \
- } while (/*CONSTCOND*/0)
+ } while (0)
static void
linux_initialprivs(void) {
Index: src/external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c
diff -u src/external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c:1.6 src/external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c:1.7
--- src/external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c:1.6 Fri Feb 19 16:42:10 2021
+++ src/external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dlz_dlopen_driver.c,v 1.6 2021/02/19 16:42:10 christos Exp $ */
+/* $NetBSD: dlz_dlopen_driver.c,v 1.7 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -67,14 +67,14 @@ typedef struct dlopen_data {
if ((cd->flags & DNS_SDLZFLAG_THREADSAFE) == 0 && \
!cd->in_configure) \
LOCK(&cd->lock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define MAYBE_UNLOCK(cd) \
do { \
if ((cd->flags & DNS_SDLZFLAG_THREADSAFE) == 0 && \
!cd->in_configure) \
UNLOCK(&cd->lock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* Log a message at the given level.
Index: src/external/mpl/bind/dist/bin/rndc/util.h
diff -u src/external/mpl/bind/dist/bin/rndc/util.h:1.4 src/external/mpl/bind/dist/bin/rndc/util.h:1.5
--- src/external/mpl/bind/dist/bin/rndc/util.h:1.4 Fri Feb 19 16:42:11 2021
+++ src/external/mpl/bind/dist/bin/rndc/util.h Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.4 2021/02/19 16:42:11 christos Exp $ */
+/* $NetBSD: util.h,v 1.5 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -30,7 +30,7 @@
fatal("%s: %s", name, isc_result_totext(result)); \
else \
notify("%s", name); \
- } while (/*CONSTCOND*/0)
+ } while (0)
ISC_LANG_BEGINDECLS
Index: src/external/mpl/bind/dist/bin/tests/makejournal.c
diff -u src/external/mpl/bind/dist/bin/tests/makejournal.c:1.5 src/external/mpl/bind/dist/bin/tests/makejournal.c:1.6
--- src/external/mpl/bind/dist/bin/tests/makejournal.c:1.5 Fri Feb 19 16:42:11 2021
+++ src/external/mpl/bind/dist/bin/tests/makejournal.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: makejournal.c,v 1.5 2021/02/19 16:42:11 christos Exp $ */
+/* $NetBSD: makejournal.c,v 1.6 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -35,7 +35,7 @@
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_mem_t *mctx = NULL;
isc_log_t *lctx = NULL;
Index: src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c
diff -u src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c:1.9 src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c:1.10
--- src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c:1.9 Fri Feb 19 16:42:12 2021
+++ src/external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: driver.c,v 1.9 2021/02/19 16:42:12 christos Exp $ */
+/* $NetBSD: driver.c,v 1.10 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -37,7 +37,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define loginfo(...) \
({ \
Index: src/external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c
diff -u src/external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c:1.5 src/external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c:1.6
--- src/external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c:1.5 Fri Feb 19 16:42:14 2021
+++ src/external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bigkey.c,v 1.5 2021/02/19 16:42:14 christos Exp $ */
+/* $NetBSD: bigkey.c,v 1.6 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -70,7 +70,7 @@ EVP_PKEY *pkey;
__LINE__); \
exit(1); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
int
main(int argc, char **argv) {
Index: src/external/mpl/bind/dist/contrib/dlz/example/dlz_example.c
diff -u src/external/mpl/bind/dist/contrib/dlz/example/dlz_example.c:1.4 src/external/mpl/bind/dist/contrib/dlz/example/dlz_example.c:1.5
--- src/external/mpl/bind/dist/contrib/dlz/example/dlz_example.c:1.4 Sun May 24 19:46:20 2020
+++ src/external/mpl/bind/dist/contrib/dlz/example/dlz_example.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dlz_example.c,v 1.4 2020/05/24 19:46:20 christos Exp $ */
+/* $NetBSD: dlz_example.c,v 1.5 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
@@ -35,7 +35,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/* For this simple example, use fixed sized strings */
struct record {
Index: src/external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h
diff -u src/external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h:1.3 src/external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h:1.4
--- src/external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h:1.3 Sun May 24 19:46:21 2020
+++ src/external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dlz_list.h,v 1.3 2020/05/24 19:46:21 christos Exp $ */
+/* $NetBSD: dlz_list.h,v 1.4 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) 1997-2002, 2004, 2006, 2007, 2011-2013, 2016 Internet Systems
@@ -20,7 +20,7 @@
do { \
(list).head = NULL; \
(list).tail = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DLZ_LINK(type) \
struct { \
@@ -30,7 +30,7 @@
do { \
(elt)->link.prev = (void *)(-1); \
(elt)->link.next = (void *)(-1); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DLZ_LIST_HEAD(list) ((list).head)
#define DLZ_LIST_TAIL(list) ((list).tail)
@@ -44,7 +44,7 @@
(elt)->link.prev = (list).tail; \
(elt)->link.next = NULL; \
(list).tail = (elt); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DLZ_LIST_PREV(elt, link) ((elt)->link.prev)
#define DLZ_LIST_NEXT(elt, link) ((elt)->link.next)
Index: src/external/mpl/bind/dist/lib/bind9/check.c
diff -u src/external/mpl/bind/dist/lib/bind9/check.c:1.10 src/external/mpl/bind/dist/lib/bind9/check.c:1.11
--- src/external/mpl/bind/dist/lib/bind9/check.c:1.10 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/bind9/check.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: check.c,v 1.10 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: check.c,v 1.11 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -615,7 +615,7 @@ check_dns64(cfg_aclconfctx_t *actx, cons
if (result == ISC_R_SUCCESS) \
result = ISC_R_RANGE; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECK_RRL_RATE(rate, def, max_rate, name) \
do { \
@@ -626,7 +626,7 @@ check_dns64(cfg_aclconfctx_t *actx, cons
CHECK_RRL(rate <= max_rate, name " %d > %d", rate, \
max_rate); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
static isc_result_t
check_ratelimit(cfg_aclconfctx_t *actx, const cfg_obj_t *voptions,
Index: src/external/mpl/bind/dist/lib/dns/adb.c
diff -u src/external/mpl/bind/dist/lib/dns/adb.c:1.7 src/external/mpl/bind/dist/lib/dns/adb.c:1.8
--- src/external/mpl/bind/dist/lib/dns/adb.c:1.7 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/adb.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.7 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: adb.c,v 1.8 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -2696,7 +2696,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_
result = ISC_R_NOMEMORY; \
goto fail1; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
ALLOCENTRY(adb, entries);
ALLOCENTRY(adb, deadentries);
ALLOCENTRY(adb, entrylocks);
@@ -2712,7 +2712,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_
result = ISC_R_NOMEMORY; \
goto fail1; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
ALLOCNAME(adb, names);
ALLOCNAME(adb, deadnames);
ALLOCNAME(adb, namelocks);
@@ -2752,7 +2752,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_
isc_mempool_setfillcount((p), FILL_COUNT); \
isc_mempool_setname((p), n); \
isc_mempool_associatelock((p), &adb->mplock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
MPINIT(dns_adbname_t, adb->nmp, "adbname");
MPINIT(dns_adbnamehook_t, adb->nhmp, "adbnamehook");
Index: src/external/mpl/bind/dist/lib/dns/dnssec.c
diff -u src/external/mpl/bind/dist/lib/dns/dnssec.c:1.7 src/external/mpl/bind/dist/lib/dns/dnssec.c:1.8
--- src/external/mpl/bind/dist/lib/dns/dnssec.c:1.7 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/dnssec.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dnssec.c,v 1.7 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: dnssec.c,v 1.8 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -54,7 +54,7 @@ LIBDNS_EXTERNAL_DATA isc_stats_t *dns_dn
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define TYPE_SIGN 0
#define TYPE_VERIFY 1
Index: src/external/mpl/bind/dist/lib/dns/dyndb.c
diff -u src/external/mpl/bind/dist/lib/dns/dyndb.c:1.7 src/external/mpl/bind/dist/lib/dns/dyndb.c:1.8
--- src/external/mpl/bind/dist/lib/dns/dyndb.c:1.7 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/dyndb.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dyndb.c,v 1.7 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: dyndb.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -40,7 +40,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
typedef struct dyndb_implementation dyndb_implementation_t;
struct dyndb_implementation {
Index: src/external/mpl/bind/dist/lib/dns/gen.c
diff -u src/external/mpl/bind/dist/lib/dns/gen.c:1.7 src/external/mpl/bind/dist/lib/dns/gen.c:1.8
--- src/external/mpl/bind/dist/lib/dns/gen.c:1.7 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/gen.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.7 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: gen.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -971,7 +971,7 @@ main(int argc, char **argv) {
"#define dns_rdataclass_%s\t" \
"((dns_rdataclass_t)dns_rdataclass_%s)\n", \
s, s); \
- } while (/*CONSTCOND*/0)
+ } while (0)
for (cc = classes; cc != NULL; cc = cc->next) {
if (cc->rdclass == 3) {
Index: src/external/mpl/bind/dist/lib/dns/master.c
diff -u src/external/mpl/bind/dist/lib/dns/master.c:1.7 src/external/mpl/bind/dist/lib/dns/master.c:1.8
--- src/external/mpl/bind/dist/lib/dns/master.c:1.7 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/master.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: master.c,v 1.7 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: master.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -247,7 +247,7 @@ loadctx_destroy(dns_loadctx_t *lctx);
} else \
goto log_and_cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GETTOKEN(lexer, options, token, eol) \
GETTOKENERR(lexer, options, token, eol, {})
@@ -270,7 +270,7 @@ loadctx_destroy(dns_loadctx_t *lctx);
isc_buffer_init(&target, target_mem, target_size); \
rdcount_save = rdcount; \
rdlcount_save = rdlcount; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define WARNUNEXPECTEDEOF(lexer) \
do { \
@@ -279,7 +279,7 @@ loadctx_destroy(dns_loadctx_t *lctx);
"%s: file does not end with " \
"newline", \
source); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define EXPECTEOL \
do { \
@@ -295,7 +295,7 @@ loadctx_destroy(dns_loadctx_t *lctx);
} else if (result != ISC_R_SUCCESS) \
goto log_and_cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define MANYERRS(lctx, result) \
((result != ISC_R_SUCCESS) && (result != ISC_R_IOERROR) && \
@@ -305,7 +305,7 @@ loadctx_destroy(dns_loadctx_t *lctx);
do { \
if ((lctx)->result == ISC_R_SUCCESS) \
(lctx)->result = r; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define LOGITFILE(result, filename) \
if (result == ISC_R_INVALIDFILE || result == ISC_R_FILENOTFOUND || \
Index: src/external/mpl/bind/dist/lib/dns/nsec3.c
diff -u src/external/mpl/bind/dist/lib/dns/nsec3.c:1.7 src/external/mpl/bind/dist/lib/dns/nsec3.c:1.8
--- src/external/mpl/bind/dist/lib/dns/nsec3.c:1.7 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/nsec3.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nsec3.c,v 1.7 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: nsec3.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -46,7 +46,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define OPTOUT(x) (((x)&DNS_NSEC3FLAG_OPTOUT) != 0)
#define CREATE(x) (((x)&DNS_NSEC3FLAG_CREATE) != 0)
Index: src/external/mpl/bind/dist/lib/dns/rbt.c
diff -u src/external/mpl/bind/dist/lib/dns/rbt.c:1.7 src/external/mpl/bind/dist/lib/dns/rbt.c:1.8
--- src/external/mpl/bind/dist/lib/dns/rbt.c:1.7 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/rbt.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbt.c,v 1.7 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: rbt.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -49,7 +49,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define RBT_MAGIC ISC_MAGIC('R', 'B', 'T', '+')
#define VALID_RBT(rbt) ISC_MAGIC_VALID(rbt, RBT_MAGIC)
@@ -283,7 +283,7 @@ getdata(dns_rbtnode_t *node, file_header
do { \
INSIST((chain)->level_count < DNS_RBT_LEVELBLOCK); \
(chain)->levels[(chain)->level_count++] = (node); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* The following macros directly access normally private name variables.
Index: src/external/mpl/bind/dist/lib/dns/spnego_asn1.c
diff -u src/external/mpl/bind/dist/lib/dns/spnego_asn1.c:1.7 src/external/mpl/bind/dist/lib/dns/spnego_asn1.c:1.8
--- src/external/mpl/bind/dist/lib/dns/spnego_asn1.c:1.7 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/spnego_asn1.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spnego_asn1.c,v 1.7 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: spnego_asn1.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -53,7 +53,7 @@ typedef struct oid {
(B) = NULL; \
} \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* ifndef __asn1_common_definitions__ */
Index: src/external/mpl/bind/dist/lib/dns/ttl.c
diff -u src/external/mpl/bind/dist/lib/dns/ttl.c:1.7 src/external/mpl/bind/dist/lib/dns/ttl.c:1.8
--- src/external/mpl/bind/dist/lib/dns/ttl.c:1.7 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/ttl.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttl.c,v 1.7 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: ttl.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -35,7 +35,7 @@
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
static isc_result_t
bind_ttl(isc_textregion_t *source, uint32_t *ttl);
Index: src/external/mpl/bind/dist/lib/dns/xfrin.c
diff -u src/external/mpl/bind/dist/lib/dns/xfrin.c:1.7 src/external/mpl/bind/dist/lib/dns/xfrin.c:1.8
--- src/external/mpl/bind/dist/lib/dns/xfrin.c:1.7 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/xfrin.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xfrin.c,v 1.7 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: xfrin.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -60,14 +60,14 @@
result = (code); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECK(op) \
do { \
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* The states of the *XFR state machine. We handle both IXFR and AXFR
Index: src/external/mpl/bind/dist/lib/dns/cache.c
diff -u src/external/mpl/bind/dist/lib/dns/cache.c:1.5 src/external/mpl/bind/dist/lib/dns/cache.c:1.6
--- src/external/mpl/bind/dist/lib/dns/cache.c:1.5 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/cache.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.c,v 1.5 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: cache.c,v 1.6 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1369,7 +1369,7 @@ dns_cache_dumpstats(dns_cache_t *cache,
xmlrc = (a); \
if (xmlrc < 0) \
goto error; \
- } while (/*CONSTCOND*/0)
+ } while (0)
static int
renderstat(const char *name, uint64_t value, xmlTextWriterPtr writer) {
int xmlrc;
Index: src/external/mpl/bind/dist/lib/dns/diff.c
diff -u src/external/mpl/bind/dist/lib/dns/diff.c:1.5 src/external/mpl/bind/dist/lib/dns/diff.c:1.6
--- src/external/mpl/bind/dist/lib/dns/diff.c:1.5 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/diff.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: diff.c,v 1.5 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: diff.c,v 1.6 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -40,7 +40,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DIFF_COMMON_LOGARGS \
dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_DIFF
Index: src/external/mpl/bind/dist/lib/dns/private.c
diff -u src/external/mpl/bind/dist/lib/dns/private.c:1.5 src/external/mpl/bind/dist/lib/dns/private.c:1.6
--- src/external/mpl/bind/dist/lib/dns/private.c:1.5 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/private.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: private.c,v 1.5 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: private.c,v 1.6 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -49,7 +49,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* Work out if 'param' should be ignored or not (i.e. it is in the process
Index: src/external/mpl/bind/dist/lib/dns/time.c
diff -u src/external/mpl/bind/dist/lib/dns/time.c:1.5 src/external/mpl/bind/dist/lib/dns/time.c:1.6
--- src/external/mpl/bind/dist/lib/dns/time.c:1.5 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/time.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: time.c,v 1.5 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: time.c,v 1.6 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -139,7 +139,7 @@ dns_time64_fromtext(const char *source,
do { \
if (value < (min) || value > (max)) \
return ((ISC_R_RANGE)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
if (strlen(source) != 14U) {
return (DNS_R_SYNTAX);
Index: src/external/mpl/bind/dist/lib/dns/timer.c
diff -u src/external/mpl/bind/dist/lib/dns/timer.c:1.5 src/external/mpl/bind/dist/lib/dns/timer.c:1.6
--- src/external/mpl/bind/dist/lib/dns/timer.c:1.5 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/timer.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: timer.c,v 1.5 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: timer.c,v 1.6 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -27,7 +27,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_result_t
dns_timer_setidle(isc_timer_t *timer, unsigned int maxtime,
Index: src/external/mpl/bind/dist/lib/dns/client.c
diff -u src/external/mpl/bind/dist/lib/dns/client.c:1.8 src/external/mpl/bind/dist/lib/dns/client.c:1.9
--- src/external/mpl/bind/dist/lib/dns/client.c:1.8 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/client.c Mon Apr 5 11:27:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.8 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: client.c,v 1.9 2021/04/05 11:27:01 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -77,7 +77,7 @@
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* DNS client object
Index: src/external/mpl/bind/dist/lib/dns/dst_api.c
diff -u src/external/mpl/bind/dist/lib/dns/dst_api.c:1.8 src/external/mpl/bind/dist/lib/dns/dst_api.c:1.9
--- src/external/mpl/bind/dist/lib/dns/dst_api.c:1.8 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/dst_api.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dst_api.c,v 1.8 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: dst_api.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -175,7 +175,7 @@ addsuffix(char *filename, int len, const
result = (x); \
if (result != ISC_R_SUCCESS) \
goto out; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECKALG(alg) \
do { \
@@ -183,7 +183,7 @@ addsuffix(char *filename, int len, const
_r = algorithm_status(alg); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_result_t
dst_lib_init(isc_mem_t *mctx, const char *engine) {
Index: src/external/mpl/bind/dist/lib/dns/name.c
diff -u src/external/mpl/bind/dist/lib/dns/name.c:1.8 src/external/mpl/bind/dist/lib/dns/name.c:1.9
--- src/external/mpl/bind/dist/lib/dns/name.c:1.8 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/name.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: name.c,v 1.8 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: name.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -118,7 +118,7 @@ static unsigned char maptolower[] = {
name->length = 0; \
name->labels = 0; \
name->attributes &= ~DNS_NAMEATTR_ABSOLUTE; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* A name is "bindable" if it can be set to point to a new value, i.e.
Index: src/external/mpl/bind/dist/lib/dns/rcode.c
diff -u src/external/mpl/bind/dist/lib/dns/rcode.c:1.8 src/external/mpl/bind/dist/lib/dns/rcode.c:1.9
--- src/external/mpl/bind/dist/lib/dns/rcode.c:1.8 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/rcode.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rcode.c,v 1.8 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: rcode.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -44,7 +44,7 @@
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define NUMBERSIZE sizeof("037777777777") /* 2^32-1 octal + NUL */
Index: src/external/mpl/bind/dist/lib/dns/sdb.c
diff -u src/external/mpl/bind/dist/lib/dns/sdb.c:1.8 src/external/mpl/bind/dist/lib/dns/sdb.c:1.9
--- src/external/mpl/bind/dist/lib/dns/sdb.c:1.8 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/sdb.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sdb.c,v 1.8 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: sdb.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -124,14 +124,14 @@ typedef struct sdb_rdatasetiter {
unsigned int flags = sdb->implementation->flags; \
if ((flags & DNS_SDBFLAG_THREADSAFE) == 0) \
LOCK(&sdb->implementation->driverlock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define MAYBE_UNLOCK(sdb) \
do { \
unsigned int flags = sdb->implementation->flags; \
if ((flags & DNS_SDBFLAG_THREADSAFE) == 0) \
UNLOCK(&sdb->implementation->driverlock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* ifdef __COVERITY__ */
static int dummy;
Index: src/external/mpl/bind/dist/lib/dns/sdlz.c
diff -u src/external/mpl/bind/dist/lib/dns/sdlz.c:1.8 src/external/mpl/bind/dist/lib/dns/sdlz.c:1.9
--- src/external/mpl/bind/dist/lib/dns/sdlz.c:1.8 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/sdlz.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sdlz.c,v 1.8 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: sdlz.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -171,14 +171,14 @@ typedef struct sdlz_rdatasetiter {
unsigned int flags = imp->flags; \
if ((flags & DNS_SDLZFLAG_THREADSAFE) == 0) \
LOCK(&imp->driverlock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define MAYBE_UNLOCK(imp) \
do { \
unsigned int flags = imp->flags; \
if ((flags & DNS_SDLZFLAG_THREADSAFE) == 0) \
UNLOCK(&imp->driverlock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* ifdef __COVERITY__ */
/*
Index: src/external/mpl/bind/dist/lib/dns/tkey.c
diff -u src/external/mpl/bind/dist/lib/dns/tkey.c:1.8 src/external/mpl/bind/dist/lib/dns/tkey.c:1.9
--- src/external/mpl/bind/dist/lib/dns/tkey.c:1.8 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/tkey.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tkey.c,v 1.8 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: tkey.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -58,7 +58,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
static void
tkey_log(const char *fmt, ...) ISC_FORMAT_PRINTF(1, 2);
Index: src/external/mpl/bind/dist/lib/dns/update.c
diff -u src/external/mpl/bind/dist/lib/dns/update.c:1.8 src/external/mpl/bind/dist/lib/dns/update.c:1.9
--- src/external/mpl/bind/dist/lib/dns/update.c:1.8 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/update.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: update.c,v 1.8 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: update.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -84,7 +84,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Fail unconditionally with result 'code', which must not
@@ -100,7 +100,7 @@
result = (code); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Fail unconditionally and log as a client error.
@@ -122,7 +122,7 @@
_what, msg, isc_result_totext(result)); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FAILN(code, name, msg) \
do { \
@@ -144,7 +144,7 @@
} \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FAILNT(code, name, type, msg) \
do { \
@@ -168,7 +168,7 @@
} \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Fail unconditionally and log as a server error.
@@ -182,7 +182,7 @@
isc_result_totext(result)); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/**************************************************************************/
Index: src/external/mpl/bind/dist/lib/dns/dnstap.c
diff -u src/external/mpl/bind/dist/lib/dns/dnstap.c:1.9 src/external/mpl/bind/dist/lib/dns/dnstap.c:1.10
--- src/external/mpl/bind/dist/lib/dns/dnstap.c:1.9 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/dnstap.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dnstap.c,v 1.9 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: dnstap.c,v 1.10 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -130,7 +130,7 @@ struct dns_dtenv {
result = (x); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
typedef struct ioq {
unsigned int generation;
Index: src/external/mpl/bind/dist/lib/dns/masterdump.c
diff -u src/external/mpl/bind/dist/lib/dns/masterdump.c:1.9 src/external/mpl/bind/dist/lib/dns/masterdump.c:1.10
--- src/external/mpl/bind/dist/lib/dns/masterdump.c:1.9 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/masterdump.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: masterdump.c,v 1.9 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: masterdump.c,v 1.10 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -58,13 +58,13 @@
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECK(x) \
do { \
if ((x) != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
struct dns_master_style {
dns_masterstyle_flags_t flags; /* DNS_STYLEFLAG_* */
@@ -460,7 +460,7 @@ totext_ctx_init(const dns_master_style_t
ctx->style.tab_width, target)) != \
ISC_R_SUCCESS) \
return ((result)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
static isc_result_t
str_totext(const char *source, isc_buffer_t *target) {
Index: src/external/mpl/bind/dist/lib/dns/rdata.c
diff -u src/external/mpl/bind/dist/lib/dns/rdata.c:1.9 src/external/mpl/bind/dist/lib/dns/rdata.c:1.10
--- src/external/mpl/bind/dist/lib/dns/rdata.c:1.9 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/rdata.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rdata.c,v 1.9 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: rdata.c,v 1.10 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -50,7 +50,7 @@
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define RETTOK(x) \
do { \
@@ -59,14 +59,14 @@
isc_lex_ungettoken(lexer, &token); \
return (_r); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECK(op) \
do { \
result = (op); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECKTOK(op) \
do { \
@@ -75,7 +75,7 @@
isc_lex_ungettoken(lexer, &token); \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DNS_AS_STR(t) ((t).value.as_textregion.base)
Index: src/external/mpl/bind/dist/lib/dns/view.c
diff -u src/external/mpl/bind/dist/lib/dns/view.c:1.9 src/external/mpl/bind/dist/lib/dns/view.c:1.10
--- src/external/mpl/bind/dist/lib/dns/view.c:1.9 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/view.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.9 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: view.c,v 1.10 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -67,7 +67,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define RESSHUTDOWN(v) \
((atomic_load(&(v)->attributes) & DNS_VIEWATTR_RESSHUTDOWN) != 0)
Index: src/external/mpl/bind/dist/lib/dns/dst_parse.c
diff -u src/external/mpl/bind/dist/lib/dns/dst_parse.c:1.6 src/external/mpl/bind/dist/lib/dns/dst_parse.c:1.7
--- src/external/mpl/bind/dist/lib/dns/dst_parse.c:1.6 Fri Feb 19 16:42:15 2021
+++ src/external/mpl/bind/dist/lib/dns/dst_parse.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dst_parse.c,v 1.6 2021/02/19 16:42:15 christos Exp $ */
+/* $NetBSD: dst_parse.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -429,7 +429,7 @@ dst__privstruct_parse(dst_key_t *key, un
ret = isc_lex_gettoken(lex, opt, token); \
if (ret != ISC_R_SUCCESS) \
goto fail; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define READLINE(lex, opt, token) \
do { \
Index: src/external/mpl/bind/dist/lib/dns/gssapi_link.c
diff -u src/external/mpl/bind/dist/lib/dns/gssapi_link.c:1.6 src/external/mpl/bind/dist/lib/dns/gssapi_link.c:1.7
--- src/external/mpl/bind/dist/lib/dns/gssapi_link.c:1.6 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/gssapi_link.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gssapi_link.c,v 1.6 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: gssapi_link.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -35,13 +35,13 @@
do { \
(gb).length = (r).length; \
(gb).value = (r).base; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GBUFFER_TO_REGION(gb, r) \
do { \
(r).length = (unsigned int)(gb).length; \
(r).base = (gb).value; \
- } while (/*CONSTCOND*/0)
+ } while (0)
struct dst_gssapi_signverifyctx {
isc_buffer_t *buffer;
Index: src/external/mpl/bind/dist/lib/dns/gssapictx.c
diff -u src/external/mpl/bind/dist/lib/dns/gssapictx.c:1.6 src/external/mpl/bind/dist/lib/dns/gssapictx.c:1.7
--- src/external/mpl/bind/dist/lib/dns/gssapictx.c:1.6 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/gssapictx.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gssapictx.c,v 1.6 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: gssapictx.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -93,20 +93,20 @@ static gss_OID_set_desc mech_oid_set = {
do { \
(gb).length = (r).length; \
(gb).value = (r).base; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GBUFFER_TO_REGION(gb, r) \
do { \
(r).length = (unsigned int)(gb).length; \
(r).base = (gb).value; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define RETERR(x) \
do { \
result = (x); \
if (result != ISC_R_SUCCESS) \
goto out; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#ifdef GSSAPI
static inline void
Index: src/external/mpl/bind/dist/lib/dns/journal.c
diff -u src/external/mpl/bind/dist/lib/dns/journal.c:1.6 src/external/mpl/bind/dist/lib/dns/journal.c:1.7
--- src/external/mpl/bind/dist/lib/dns/journal.c:1.6 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/journal.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: journal.c,v 1.6 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: journal.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -94,14 +94,14 @@
result = (code); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECK(op) \
do { \
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define JOURNAL_SERIALSET 0x01U
Index: src/external/mpl/bind/dist/lib/dns/nsec.c
diff -u src/external/mpl/bind/dist/lib/dns/nsec.c:1.6 src/external/mpl/bind/dist/lib/dns/nsec.c:1.7
--- src/external/mpl/bind/dist/lib/dns/nsec.c:1.6 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/nsec.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nsec.c,v 1.6 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: nsec.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -35,7 +35,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
void
dns_nsec_setbit(unsigned char *array, unsigned int type, unsigned int bit) {
Index: src/external/mpl/bind/dist/lib/dns/keymgr.c
diff -u src/external/mpl/bind/dist/lib/dns/keymgr.c:1.4 src/external/mpl/bind/dist/lib/dns/keymgr.c:1.5
--- src/external/mpl/bind/dist/lib/dns/keymgr.c:1.4 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/keymgr.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: keymgr.c,v 1.4 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: keymgr.c,v 1.5 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -39,7 +39,7 @@
result = (x); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* Set key state to `target` state and change last changed
@@ -52,7 +52,7 @@
dst_key_setstate((key), (state), (target)); \
dst_key_settime((key), (timing), time); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
/* Shorter keywords for better readability. */
#define HIDDEN DST_KEY_STATE_HIDDEN
Index: src/external/mpl/bind/dist/lib/dns/message.c
diff -u src/external/mpl/bind/dist/lib/dns/message.c:1.11 src/external/mpl/bind/dist/lib/dns/message.c:1.12
--- src/external/mpl/bind/dist/lib/dns/message.c:1.11 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/message.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: message.c,v 1.11 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: message.c,v 1.12 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -980,7 +980,7 @@ getrdata(isc_buffer_t *source, dns_messa
result = r; \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
static isc_result_t
getquestions(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
@@ -3344,7 +3344,7 @@ dns_message_checksig(dns_message_t *msg,
for (__i = 0; __i < msg->indent.count; __i++) { \
ADD_STRING(target, msg->indent.string); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_result_t
dns_message_sectiontotext(dns_message_t *msg, dns_section_t section,
Index: src/external/mpl/bind/dist/lib/dns/rbtdb.c
diff -u src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.11 src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.12
--- src/external/mpl/bind/dist/lib/dns/rbtdb.c:1.11 Tue Mar 23 18:46:07 2021
+++ src/external/mpl/bind/dist/lib/dns/rbtdb.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtdb.c,v 1.11 2021/03/23 18:46:07 rillig Exp $ */
+/* $NetBSD: rbtdb.c,v 1.12 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -83,7 +83,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* This is the map file header for RBTDB images. It is populated, and then
Index: src/external/mpl/bind/dist/lib/dns/resolver.c
diff -u src/external/mpl/bind/dist/lib/dns/resolver.c:1.11 src/external/mpl/bind/dist/lib/dns/resolver.c:1.12
--- src/external/mpl/bind/dist/lib/dns/resolver.c:1.11 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/resolver.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: resolver.c,v 1.11 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: resolver.c,v 1.12 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -111,46 +111,46 @@
#define RTRACE(m) \
do { \
UNUSED(m); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define RRTRACE(r, m) \
do { \
UNUSED(r); \
UNUSED(m); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FCTXTRACE(m) \
do { \
UNUSED(m); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FCTXTRACE2(m1, m2) \
do { \
UNUSED(m1); \
UNUSED(m2); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FCTXTRACE3(m1, res) \
do { \
UNUSED(m1); \
UNUSED(res); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FCTXTRACE4(m1, m2, res) \
do { \
UNUSED(m1); \
UNUSED(m2); \
UNUSED(res); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FCTXTRACE5(m1, m2, v) \
do { \
UNUSED(m1); \
UNUSED(m2); \
UNUSED(v); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FTRACE(m) \
do { \
UNUSED(m); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define QTRACE(m) \
do { \
UNUSED(m); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* WANT_QUERYTRACE */
#define US_PER_SEC 1000000U
Index: src/external/mpl/bind/dist/lib/dns/zone.c
diff -u src/external/mpl/bind/dist/lib/dns/zone.c:1.12 src/external/mpl/bind/dist/lib/dns/zone.c:1.13
--- src/external/mpl/bind/dist/lib/dns/zone.c:1.12 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/zone.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zone.c,v 1.12 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: zone.c,v 1.13 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -163,12 +163,12 @@ typedef struct dns_include dns_include_t
LOCK(&(z)->lock); \
INSIST(!(z)->locked); \
(z)->locked = true; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define UNLOCK_ZONE(z) \
do { \
(z)->locked = false; \
UNLOCK(&(z)->lock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define LOCKED_ZONE(z) ((z)->locked)
#define TRYLOCK_ZONE(result, z) \
do { \
@@ -177,7 +177,7 @@ typedef struct dns_include dns_include_t
INSIST(!(z)->locked); \
(z)->locked = true; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#else /* ifdef DNS_ZONE_CHECKLOCK */
#define LOCK_ZONE(z) LOCK(&(z)->lock)
#define UNLOCK_ZONE(z) UNLOCK(&(z)->lock)
@@ -185,7 +185,7 @@ typedef struct dns_include dns_include_t
#define TRYLOCK_ZONE(result, z) \
do { \
result = isc_mutex_trylock(&(z)->lock); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* ifdef DNS_ZONE_CHECKLOCK */
#define ZONEDB_INITLOCK(l) isc_rwlock_init((l), 0, 0)
@@ -462,7 +462,7 @@ struct dns_zone {
dns__zonediff_t *_z = (z); \
(_z)->diff = (d); \
(_z)->offline = false; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DNS_ZONE_FLAG(z, f) ((atomic_load_relaxed(&(z)->flags) & (f)) != 0)
#define DNS_ZONE_SETFLAG(z, f) atomic_fetch_or(&(z)->flags, (f))
@@ -540,7 +540,7 @@ typedef enum {
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
struct dns_unreachable {
isc_sockaddr_t remote;
@@ -915,7 +915,7 @@ static const char *dbargv_default[] = {
isc_interval_set(&_i, _j / 2, 0); \
(void)isc_time_add((a), &_i, (c)); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DNS_ZONE_TIME_ADD(a, b, c) \
do { \
@@ -929,7 +929,7 @@ static const char *dbargv_default[] = {
isc_interval_set(&_i, (b) / 2, 0); \
(void)isc_time_add((a), &_i, (c)); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
typedef struct nsec3param nsec3param_t;
struct nsec3param {
Index: src/external/mpl/bind/dist/lib/dns/include/dns/name.h
diff -u src/external/mpl/bind/dist/lib/dns/include/dns/name.h:1.6 src/external/mpl/bind/dist/lib/dns/include/dns/name.h:1.7
--- src/external/mpl/bind/dist/lib/dns/include/dns/name.h:1.6 Fri Feb 19 16:42:16 2021
+++ src/external/mpl/bind/dist/lib/dns/include/dns/name.h Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: name.h,v 1.6 2021/02/19 16:42:16 christos Exp $ */
+/* $NetBSD: name.h,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1350,7 +1350,7 @@ ISC_LANG_ENDDECLS
_n->buffer = NULL; \
ISC_LINK_INIT(_n, link); \
ISC_LIST_INIT(_n->list); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DNS_NAME_RESET(n) \
do { \
@@ -1360,7 +1360,7 @@ ISC_LANG_ENDDECLS
(n)->attributes &= ~DNS_NAMEATTR_ABSOLUTE; \
if ((n)->buffer != NULL) \
isc_buffer_clear((n)->buffer); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DNS_NAME_SETBUFFER(n, b) (n)->buffer = (b)
@@ -1373,7 +1373,7 @@ ISC_LANG_ENDDECLS
do { \
(r)->base = (n)->ndata; \
(r)->length = (n)->length; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DNS_NAME_SPLIT(n, l, p, s) \
do { \
@@ -1386,7 +1386,7 @@ ISC_LANG_ENDDECLS
if (_s != NULL) \
dns_name_getlabelsequence(_n, _n->labels - _l, _l, \
_s); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#ifdef DNS_NAME_USEINLINE
Index: src/external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h
diff -u src/external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h:1.4 src/external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h:1.5
--- src/external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h:1.4 Fri Feb 19 16:42:17 2021
+++ src/external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rdatastructpre.h,v 1.4 2021/02/19 16:42:17 christos Exp $ */
+/* $NetBSD: rdatastructpre.h,v 1.5 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -33,4 +33,4 @@ typedef struct dns_rdatacommon {
(_data)->common.rdtype = (_rdtype); \
(_data)->common.rdclass = (_rdclass); \
ISC_LINK_INIT(&(_data)->common, link); \
- } while (/*CONSTCOND*/0)
+ } while (0)
Index: src/external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c
diff -u src/external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c:1.7 src/external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c:1.8
--- src/external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c:1.7 Fri Feb 19 16:42:18 2021
+++ src/external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wks_11.c,v 1.7 2021/02/19 16:42:18 christos Exp $ */
+/* $NetBSD: wks_11.c,v 1.8 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -30,7 +30,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* ifndef CHECK */
#define RRTYPE_WKS_ATTRIBUTES (0)
Index: src/external/mpl/bind/dist/lib/dns/tests/dnstest.c
diff -u src/external/mpl/bind/dist/lib/dns/tests/dnstest.c:1.8 src/external/mpl/bind/dist/lib/dns/tests/dnstest.c:1.9
--- src/external/mpl/bind/dist/lib/dns/tests/dnstest.c:1.8 Fri Feb 19 16:42:18 2021
+++ src/external/mpl/bind/dist/lib/dns/tests/dnstest.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dnstest.c,v 1.8 2021/02/19 16:42:18 christos Exp $ */
+/* $NetBSD: dnstest.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -61,7 +61,7 @@
if (result != ISC_R_SUCCESS) { \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_mem_t *dt_mctx = NULL;
isc_log_t *lctx = NULL;
Index: src/external/mpl/bind/dist/lib/dns/tests/tsig_test.c
diff -u src/external/mpl/bind/dist/lib/dns/tests/tsig_test.c:1.6 src/external/mpl/bind/dist/lib/dns/tests/tsig_test.c:1.7
--- src/external/mpl/bind/dist/lib/dns/tests/tsig_test.c:1.6 Fri Feb 19 16:42:18 2021
+++ src/external/mpl/bind/dist/lib/dns/tests/tsig_test.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tsig_test.c,v 1.6 2021/02/19 16:42:18 christos Exp $ */
+/* $NetBSD: tsig_test.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -41,7 +41,7 @@
if (result != ISC_R_SUCCESS) { \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define TEST_ORIGIN "test"
Index: src/external/mpl/bind/dist/lib/irs/getnameinfo.c
diff -u src/external/mpl/bind/dist/lib/irs/getnameinfo.c:1.5 src/external/mpl/bind/dist/lib/irs/getnameinfo.c:1.6
--- src/external/mpl/bind/dist/lib/irs/getnameinfo.c:1.5 Fri Feb 19 16:42:18 2021
+++ src/external/mpl/bind/dist/lib/irs/getnameinfo.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.5 2021/02/19 16:42:18 christos Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.6 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -137,7 +137,7 @@ static struct afd {
result = (code); \
if (result != 0) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#ifdef _WIN32
int
Index: src/external/mpl/bind/dist/lib/isc/base32.c
diff -u src/external/mpl/bind/dist/lib/isc/base32.c:1.6 src/external/mpl/bind/dist/lib/isc/base32.c:1.7
--- src/external/mpl/bind/dist/lib/isc/base32.c:1.6 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/base32.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: base32.c,v 1.6 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: base32.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -27,7 +27,7 @@
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*@{*/
/*!
Index: src/external/mpl/bind/dist/lib/isc/base64.c
diff -u src/external/mpl/bind/dist/lib/isc/base64.c:1.6 src/external/mpl/bind/dist/lib/isc/base64.c:1.7
--- src/external/mpl/bind/dist/lib/isc/base64.c:1.6 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/base64.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: base64.c,v 1.6 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: base64.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -26,7 +26,7 @@
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*@{*/
/*!
Index: src/external/mpl/bind/dist/lib/isc/hex.c
diff -u src/external/mpl/bind/dist/lib/isc/hex.c:1.6 src/external/mpl/bind/dist/lib/isc/hex.c:1.7
--- src/external/mpl/bind/dist/lib/isc/hex.c:1.6 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/hex.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hex.c,v 1.6 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: hex.c,v 1.7 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -27,7 +27,7 @@
isc_result_t _r = (x); \
if (_r != ISC_R_SUCCESS) \
return ((_r)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* BEW: These static functions are copied from lib/dns/rdata.c.
Index: src/external/mpl/bind/dist/lib/isc/mem.c
diff -u src/external/mpl/bind/dist/lib/isc/mem.c:1.8 src/external/mpl/bind/dist/lib/isc/mem.c:1.9
--- src/external/mpl/bind/dist/lib/isc/mem.c:1.8 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/mem.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.8 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: mem.c,v 1.9 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -221,13 +221,13 @@ struct isc__mempool {
if (ISC_UNLIKELY((isc_mem_debugging & TRACE_OR_RECORD) != 0 && \
b != NULL)) \
add_trace_entry(a, b, c, d, e); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define DELETE_TRACE(a, b, c, d, e) \
do { \
if (ISC_UNLIKELY((isc_mem_debugging & TRACE_OR_RECORD) != 0 && \
b != NULL)) \
delete_trace_entry(a, b, c, d, e); \
- } while (/*CONSTCOND*/0)
+ } while (0)
static void
print_active(isc__mem_t *ctx, FILE *out);
@@ -2092,7 +2092,7 @@ typedef struct summarystat {
xmlrc = (a); \
if (xmlrc < 0) \
goto error; \
- } while (/*CONSTCOND*/0)
+ } while (0)
static int
xml_renderctx(isc__mem_t *ctx, summarystat_t *summary,
xmlTextWriterPtr writer) {
Index: src/external/mpl/bind/dist/lib/isc/regex.c
diff -u src/external/mpl/bind/dist/lib/isc/regex.c:1.5 src/external/mpl/bind/dist/lib/isc/regex.c:1.6
--- src/external/mpl/bind/dist/lib/isc/regex.c:1.5 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/regex.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: regex.c,v 1.5 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: regex.c,v 1.6 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -23,7 +23,7 @@
do { \
reason = (x); \
goto error; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#else /* if VALREGEX_REPORT_REASON */
#define FAIL(x) goto error
#endif /* if VALREGEX_REPORT_REASON */
Index: src/external/mpl/bind/dist/lib/isc/task.c
diff -u src/external/mpl/bind/dist/lib/isc/task.c:1.12 src/external/mpl/bind/dist/lib/isc/task.c:1.13
--- src/external/mpl/bind/dist/lib/isc/task.c:1.12 Mon Apr 5 10:19:34 2021
+++ src/external/mpl/bind/dist/lib/isc/task.c Mon Apr 5 11:27:02 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: task.c,v 1.12 2021/04/05 10:19:34 rillig Exp $ */
+/* $NetBSD: task.c,v 1.13 2021/04/05 11:27:02 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -1805,7 +1805,7 @@ isc_task_exiting(isc_task_t *t) {
xmlrc = (a); \
if (xmlrc < 0) \
goto error; \
- } while (/*CONSTCOND*/0)
+ } while (0)
int
isc_taskmgr_renderxml(isc_taskmgr_t *mgr0, void *writer0) {
isc__taskmgr_t *mgr = (isc__taskmgr_t *)mgr0;
@@ -1914,7 +1914,7 @@ error:
result = ISC_R_NOMEMORY; \
goto error; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_result_t
isc_taskmgr_renderjson(isc_taskmgr_t *mgr0, void *tasks0) {
Index: src/external/mpl/bind/dist/lib/isc/include/isc/buffer.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/buffer.h:1.5 src/external/mpl/bind/dist/lib/isc/include/isc/buffer.h:1.6
--- src/external/mpl/bind/dist/lib/isc/include/isc/buffer.h:1.5 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/buffer.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: buffer.h,v 1.5 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: buffer.h,v 1.6 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -804,7 +804,7 @@ ISC_LANG_ENDDECLS
ISC_LINK_INIT(_b, link); \
(_b)->magic = ISC_BUFFER_MAGIC; \
(_b)->autore = false; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_INITNULL(_b) ISC__BUFFER_INIT(_b, NULL, 0)
@@ -816,30 +816,30 @@ ISC_LANG_ENDDECLS
(_b)->used = 0; \
(_b)->current = 0; \
(_b)->active = 0; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_REGION(_b, _r) \
do { \
(_r)->base = (_b)->base; \
(_r)->length = (_b)->length; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_USEDREGION(_b, _r) \
do { \
(_r)->base = (_b)->base; \
(_r)->length = (_b)->used; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_AVAILABLEREGION(_b, _r) \
do { \
(_r)->base = isc_buffer_used(_b); \
(_r)->length = isc_buffer_availablelength(_b); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_ADD(_b, _n) \
do { \
(_b)->used += (_n); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_SUBTRACT(_b, _n) \
do { \
@@ -848,26 +848,26 @@ ISC_LANG_ENDDECLS
(_b)->current = (_b)->used; \
if ((_b)->active > (_b)->used) \
(_b)->active = (_b)->used; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_CLEAR(_b) \
do { \
(_b)->used = 0; \
(_b)->current = 0; \
(_b)->active = 0; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_CONSUMEDREGION(_b, _r) \
do { \
(_r)->base = (_b)->base; \
(_r)->length = (_b)->current; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_REMAININGREGION(_b, _r) \
do { \
(_r)->base = isc_buffer_current(_b); \
(_r)->length = isc_buffer_remaininglength(_b); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_ACTIVEREGION(_b, _r) \
do { \
@@ -878,27 +878,27 @@ ISC_LANG_ENDDECLS
(_r)->base = NULL; \
(_r)->length = 0; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_SETACTIVE(_b, _n) \
do { \
(_b)->active = (_b)->current + (_n); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_FIRST(_b) \
do { \
(_b)->current = 0; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_FORWARD(_b, _n) \
do { \
(_b)->current += (_n); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_BACK(_b, _n) \
do { \
(_b)->current -= (_n); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_PUTMEM(_b, _base, _length) \
do { \
@@ -913,7 +913,7 @@ ISC_LANG_ENDDECLS
memmove(isc_buffer_used(_b), (_base), (_length)); \
(_b)->used += (_length); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_PUTSTR(_b, _source) \
do { \
@@ -929,7 +929,7 @@ ISC_LANG_ENDDECLS
_cp = isc_buffer_used(_b); \
memmove(_cp, (_source), _length); \
(_b)->used += (_length); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_PUTUINT8(_b, _val) \
do { \
@@ -945,7 +945,7 @@ ISC_LANG_ENDDECLS
_cp = isc_buffer_used(_b); \
(_b)->used++; \
_cp[0] = _val2; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_PUTUINT16(_b, _val) \
do { \
@@ -962,7 +962,7 @@ ISC_LANG_ENDDECLS
(_b)->used += 2; \
_cp[0] = (unsigned char)(_val2 >> 8); \
_cp[1] = (unsigned char)_val2; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_PUTUINT24(_b, _val) \
do { \
@@ -980,7 +980,7 @@ ISC_LANG_ENDDECLS
_cp[0] = (unsigned char)(_val2 >> 16); \
_cp[1] = (unsigned char)(_val2 >> 8); \
_cp[2] = (unsigned char)_val2; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC__BUFFER_PUTUINT32(_b, _val) \
do { \
@@ -999,7 +999,7 @@ ISC_LANG_ENDDECLS
_cp[1] = (unsigned char)(_val2 >> 16); \
_cp[2] = (unsigned char)(_val2 >> 8); \
_cp[3] = (unsigned char)_val2; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#if defined(ISC_BUFFER_USEINLINE)
#define isc_buffer_init ISC__BUFFER_INIT
@@ -1057,7 +1057,7 @@ ISC_LANG_ENDDECLS
} _deconst; \
_deconst._const = (_d); \
isc_buffer_init((_b), _deconst._var, (_l)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* No inline method for this one (yet).
Index: src/external/mpl/bind/dist/lib/isc/include/isc/list.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/list.h:1.5 src/external/mpl/bind/dist/lib/isc/include/isc/list.h:1.6
--- src/external/mpl/bind/dist/lib/isc/include/isc/list.h:1.5 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/list.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: list.h,v 1.5 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: list.h,v 1.6 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -30,7 +30,7 @@
do { \
(list).head = NULL; \
(list).tail = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LINK(type) \
struct { \
@@ -40,7 +40,7 @@
do { \
(elt)->link.prev = (type *)(-1); \
(elt)->link.next = (type *)(-1); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LINK_INIT(elt, link) ISC_LINK_INIT_TYPE(elt, link, void)
#define ISC_LINK_LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1))
@@ -58,13 +58,13 @@
(elt)->link.prev = NULL; \
(elt)->link.next = (list).head; \
(list).head = (elt); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_PREPEND(list, elt, link) \
do { \
ISC_LINK_INSIST(!ISC_LINK_LINKED(elt, link)); \
__ISC_LIST_PREPENDUNSAFE(list, elt, link); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_INITANDPREPEND(list, elt, link) \
__ISC_LIST_PREPENDUNSAFE(list, elt, link)
@@ -79,13 +79,13 @@
(elt)->link.prev = (list).tail; \
(elt)->link.next = NULL; \
(list).tail = (elt); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_APPEND(list, elt, link) \
do { \
ISC_LINK_INSIST(!ISC_LINK_LINKED(elt, link)); \
__ISC_LIST_APPENDUNSAFE(list, elt, link); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_INITANDAPPEND(list, elt, link) \
__ISC_LIST_APPENDUNSAFE(list, elt, link)
@@ -108,7 +108,7 @@
(elt)->link.next = (type *)(-1); \
ISC_INSIST((list).head != (elt)); \
ISC_INSIST((list).tail != (elt)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define __ISC_LIST_UNLINKUNSAFE(list, elt, link) \
__ISC_LIST_UNLINKUNSAFE_TYPE(list, elt, link, void)
@@ -117,7 +117,7 @@
do { \
ISC_LINK_INSIST(ISC_LINK_LINKED(elt, link)); \
__ISC_LIST_UNLINKUNSAFE_TYPE(list, elt, link, type); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_UNLINK(list, elt, link) \
ISC_LIST_UNLINK_TYPE(list, elt, link, void)
@@ -134,14 +134,14 @@
(elt)->link.prev->link.next = (elt); \
(elt)->link.next = (before); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_INSERTBEFORE(list, before, elt, link) \
do { \
ISC_LINK_INSIST(ISC_LINK_LINKED(before, link)); \
ISC_LINK_INSIST(!ISC_LINK_LINKED(elt, link)); \
__ISC_LIST_INSERTBEFOREUNSAFE(list, before, elt, link); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define __ISC_LIST_INSERTAFTERUNSAFE(list, after, elt, link) \
do { \
@@ -153,14 +153,14 @@
(elt)->link.next->link.prev = (elt); \
(elt)->link.prev = (after); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_INSERTAFTER(list, after, elt, link) \
do { \
ISC_LINK_INSIST(ISC_LINK_LINKED(after, link)); \
ISC_LINK_INSIST(!ISC_LINK_LINKED(elt, link)); \
__ISC_LIST_INSERTAFTERUNSAFE(list, after, elt, link); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_APPENDLIST(list1, list2, link) \
do { \
@@ -173,7 +173,7 @@
} \
(list2).head = NULL; \
(list2).tail = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_PREPENDLIST(list1, list2, link) \
do { \
@@ -186,7 +186,7 @@
} \
(list2).head = NULL; \
(list2).tail = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ISC_LIST_ENQUEUE(list, elt, link) ISC_LIST_APPEND(list, elt, link)
#define __ISC_LIST_ENQUEUEUNSAFE(list, elt, link) \
Index: src/external/mpl/bind/dist/lib/isc/include/isc/mem.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/mem.h:1.5 src/external/mpl/bind/dist/lib/isc/include/isc/mem.h:1.6
--- src/external/mpl/bind/dist/lib/isc/include/isc/mem.h:1.5 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/mem.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.h,v 1.5 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: mem.h,v 1.6 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -234,22 +234,22 @@ struct isc_mempool {
do { \
ISCMEMFUNC(put)((c), (p), (s)_ISC_MEM_FILELINE); \
(p) = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define isc_mem_putanddetach(c, p, s) \
do { \
ISCMEMFUNC(putanddetach)((c), (p), (s)_ISC_MEM_FILELINE); \
(p) = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define isc_mem_free(c, p) \
do { \
ISCMEMFUNC(free)((c), (p)_ISC_MEM_FILELINE); \
(p) = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define isc_mempool_put(c, p) \
do { \
ISCMEMPOOLFUNC(put)((c), (p)_ISC_MEM_FILELINE); \
(p) = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*@{*/
void
Index: src/external/mpl/bind/dist/lib/isc/include/isc/event.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/event.h:1.4 src/external/mpl/bind/dist/lib/isc/include/isc/event.h:1.5
--- src/external/mpl/bind/dist/lib/isc/include/isc/event.h:1.4 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/event.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: event.h,v 1.4 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: event.h,v 1.5 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -67,7 +67,7 @@ typedef void (*isc_eventdestructor_t)(is
(event)->ev_destroy_arg = (da); \
ISC_LINK_INIT((event), ev_link); \
ISC_LINK_INIT((event), ev_ratelink); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* This structure is public because "subclassing" it may be useful when
Index: src/external/mpl/bind/dist/lib/isc/include/isc/region.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/region.h:1.4 src/external/mpl/bind/dist/lib/isc/include/isc/region.h:1.5
--- src/external/mpl/bind/dist/lib/isc/include/isc/region.h:1.4 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/region.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: region.h,v 1.4 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: region.h,v 1.5 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -55,7 +55,7 @@ struct isc_consttextregion {
INSIST(_r->length >= _l); \
_r->base += _l; \
_r->length -= _l; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define isc_textregion_consume(r, l) \
do { \
@@ -64,7 +64,7 @@ struct isc_consttextregion {
INSIST(_r->length >= _l); \
_r->base += _l; \
_r->length -= _l; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define isc_constregion_consume(r, l) \
do { \
@@ -73,7 +73,7 @@ struct isc_consttextregion {
INSIST(_r->length >= _l); \
_r->base += _l; \
_r->length -= _l; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*@}*/
ISC_LANG_BEGINDECLS
Index: src/external/mpl/bind/dist/lib/isc/include/isc/util.h
diff -u src/external/mpl/bind/dist/lib/isc/include/isc/util.h:1.10 src/external/mpl/bind/dist/lib/isc/include/isc/util.h:1.11
--- src/external/mpl/bind/dist/lib/isc/include/isc/util.h:1.10 Fri Feb 19 16:42:19 2021
+++ src/external/mpl/bind/dist/lib/isc/include/isc/util.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.10 2021/02/19 16:42:19 christos Exp $ */
+/* $NetBSD: util.h,v 1.11 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -76,7 +76,7 @@
} _u; \
_u.k = konst; \
var = _u.v; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
@@ -109,13 +109,13 @@
RUNTIME_CHECK(isc_mutex_lock((lp)) == ISC_R_SUCCESS); \
ISC_UTIL_TRACE(fprintf(stderr, "LOCKED %p %s %d\n", (lp), \
__FILE__, __LINE__)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define UNLOCK(lp) \
do { \
RUNTIME_CHECK(isc_mutex_unlock((lp)) == ISC_R_SUCCESS); \
ISC_UTIL_TRACE(fprintf(stderr, "UNLOCKED %p %s %d\n", (lp), \
__FILE__, __LINE__)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define BROADCAST(cvp) \
do { \
@@ -123,13 +123,13 @@
__FILE__, __LINE__)); \
RUNTIME_CHECK(isc_condition_broadcast((cvp)) == \
ISC_R_SUCCESS); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define SIGNAL(cvp) \
do { \
ISC_UTIL_TRACE(fprintf(stderr, "SIGNAL %p %s %d\n", (cvp), \
__FILE__, __LINE__)); \
RUNTIME_CHECK(isc_condition_signal((cvp)) == ISC_R_SUCCESS); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define WAIT(cvp, lp) \
do { \
ISC_UTIL_TRACE(fprintf(stderr, "WAIT %p LOCK %p %s %d\n", \
@@ -138,7 +138,7 @@
ISC_R_SUCCESS); \
ISC_UTIL_TRACE(fprintf(stderr, "WAITED %p LOCKED %p %s %d\n", \
(cvp), (lp), __FILE__, __LINE__)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* isc_condition_waituntil can return ISC_R_TIMEDOUT, so we
@@ -156,13 +156,13 @@
RUNTIME_CHECK(isc_rwlock_lock((lp), (t)) == ISC_R_SUCCESS); \
ISC_UTIL_TRACE(fprintf(stderr, "RWLOCKED %p, %d %s %d\n", \
(lp), (t), __FILE__, __LINE__)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define RWUNLOCK(lp, t) \
do { \
ISC_UTIL_TRACE(fprintf(stderr, "RWUNLOCK %p, %d %s %d\n", \
(lp), (t), __FILE__, __LINE__)); \
RUNTIME_CHECK(isc_rwlock_unlock((lp), (t)) == ISC_R_SUCCESS); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* List Macros.
Index: src/external/mpl/bind/dist/lib/isc/pthreads/mutex.c
diff -u src/external/mpl/bind/dist/lib/isc/pthreads/mutex.c:1.6 src/external/mpl/bind/dist/lib/isc/pthreads/mutex.c:1.7
--- src/external/mpl/bind/dist/lib/isc/pthreads/mutex.c:1.6 Fri Feb 19 16:42:20 2021
+++ src/external/mpl/bind/dist/lib/isc/pthreads/mutex.c Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.c,v 1.6 2021/02/19 16:42:20 christos Exp $ */
+/* $NetBSD: mutex.c,v 1.7 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -39,7 +39,7 @@
(vvp)->tv_sec++; \
(vvp)->tv_usec -= 1000000; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define timevalsub(vvp, uvp) \
do { \
(vvp)->tv_sec -= (uvp)->tv_sec; \
@@ -48,7 +48,7 @@
(vvp)->tv_sec--; \
(vvp)->tv_usec += 1000000; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*@}*/
Index: src/external/mpl/bind/dist/lib/isc/tests/isctest.h
diff -u src/external/mpl/bind/dist/lib/isc/tests/isctest.h:1.5 src/external/mpl/bind/dist/lib/isc/tests/isctest.h:1.6
--- src/external/mpl/bind/dist/lib/isc/tests/isctest.h:1.5 Fri Feb 19 16:42:20 2021
+++ src/external/mpl/bind/dist/lib/isc/tests/isctest.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isctest.h,v 1.5 2021/02/19 16:42:20 christos Exp $ */
+/* $NetBSD: isctest.h,v 1.6 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -33,7 +33,7 @@
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
extern isc_mem_t *test_mctx;
extern isc_log_t *test_lctx;
Index: src/external/mpl/bind/dist/lib/isc/unix/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.21 src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.22
--- src/external/mpl/bind/dist/lib/isc/unix/socket.c:1.21 Sat Apr 3 22:20:26 2021
+++ src/external/mpl/bind/dist/lib/isc/unix/socket.c Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.21 2021/04/03 22:20:26 christos Exp $ */
+/* $NetBSD: socket.c,v 1.22 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -5467,7 +5467,7 @@ _socktype(isc_sockettype_t type) {
xmlrc = (a); \
if (xmlrc < 0) \
goto error; \
- } while (/*CONSTCOND*/0)
+ } while (0)
int
isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, void *writer0) {
isc__socketmgr_t *mgr = (isc__socketmgr_t *)mgr0;
@@ -5574,7 +5574,7 @@ error:
result = ISC_R_NOMEMORY; \
goto error; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_result_t
isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, void *stats0) {
Index: src/external/mpl/bind/dist/lib/isc/win32/ntgroups.c
diff -u src/external/mpl/bind/dist/lib/isc/win32/ntgroups.c:1.6 src/external/mpl/bind/dist/lib/isc/win32/ntgroups.c:1.7
--- src/external/mpl/bind/dist/lib/isc/win32/ntgroups.c:1.6 Fri Feb 19 16:42:21 2021
+++ src/external/mpl/bind/dist/lib/isc/win32/ntgroups.c Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ntgroups.c,v 1.6 2021/02/19 16:42:21 christos Exp $ */
+/* $NetBSD: ntgroups.c,v 1.7 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -49,7 +49,7 @@
if (result != ISC_R_SUCCESS) { \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_result_t
isc_ntsecurity_getaccountgroups(char *username, char **GroupList,
Index: src/external/mpl/bind/dist/lib/isc/win32/socket.c
diff -u src/external/mpl/bind/dist/lib/isc/win32/socket.c:1.9 src/external/mpl/bind/dist/lib/isc/win32/socket.c:1.10
--- src/external/mpl/bind/dist/lib/isc/win32/socket.c:1.9 Fri Feb 19 16:42:21 2021
+++ src/external/mpl/bind/dist/lib/isc/win32/socket.c Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.c,v 1.9 2021/02/19 16:42:21 christos Exp $ */
+/* $NetBSD: socket.c,v 1.10 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -110,7 +110,7 @@ LPFN_GETACCEPTEXSOCKADDRS ISCGetAcceptEx
#else /* ifdef ISC_SOCKET_CONSISTENCY_CHECKS */
#define CONSISTENT(sock) \
do { \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* ifdef ISC_SOCKET_CONSISTENCY_CHECKS */
static void
consistent(isc_socket_t *sock);
@@ -295,7 +295,7 @@ struct isc_socket {
do { \
(sock)->state = (_state); \
(sock)->state_lineno = __LINE__; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* I/O Completion ports Info structures
@@ -3700,7 +3700,7 @@ _socktype(isc_sockettype_t type) {
xmlrc = (a); \
if (xmlrc < 0) \
goto error; \
- } while (/*CONSTCOND*/0)
+ } while (0)
int
isc_socketmgr_renderxml(isc_socketmgr_t *mgr, void *writer0) {
isc_socket_t *sock = NULL;
@@ -3821,7 +3821,7 @@ error:
result = ISC_R_NOMEMORY; \
goto error; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_result_t
isc_socketmgr_renderjson(isc_socketmgr_t *mgr, void *stats0) {
isc_result_t result = ISC_R_SUCCESS;
Index: src/external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h
diff -u src/external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h:1.5 src/external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h:1.6
--- src/external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h:1.5 Fri Feb 19 16:42:21 2021
+++ src/external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.5 2021/02/19 16:42:21 christos Exp $ */
+/* $NetBSD: mutex.h,v 1.6 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -42,6 +42,6 @@ TryEnterCriticalSection(LPCRITICAL_SECTI
*/
#define isc_mutex_stats(fp) \
do { \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* ISC_MUTEX_H */
Index: src/external/mpl/bind/dist/lib/isc/win32/include/isc/net.h
diff -u src/external/mpl/bind/dist/lib/isc/win32/include/isc/net.h:1.5 src/external/mpl/bind/dist/lib/isc/win32/include/isc/net.h:1.6
--- src/external/mpl/bind/dist/lib/isc/win32/include/isc/net.h:1.5 Fri Feb 19 16:42:21 2021
+++ src/external/mpl/bind/dist/lib/isc/win32/include/isc/net.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: net.h,v 1.5 2021/02/19 16:42:21 christos Exp $ */
+/* $NetBSD: net.h,v 1.6 2021/04/05 11:27:03 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -149,7 +149,7 @@ typedef uint16_t in_port_t;
break; \
} \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#undef FD_SET
#define FD_SET(fd, set) \
@@ -168,7 +168,7 @@ typedef uint16_t in_port_t;
((fd_set FAR *)(set))->fd_count++; \
} \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* Windows Sockets errors redefined as regular Berkeley error constants.
Index: src/external/mpl/bind/dist/lib/isccc/include/isccc/util.h
diff -u src/external/mpl/bind/dist/lib/isccc/include/isccc/util.h:1.5 src/external/mpl/bind/dist/lib/isccc/include/isccc/util.h:1.6
--- src/external/mpl/bind/dist/lib/isccc/include/isccc/util.h:1.5 Fri Feb 19 16:42:21 2021
+++ src/external/mpl/bind/dist/lib/isccc/include/isccc/util.h Mon Apr 5 11:27:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.5 2021/02/19 16:42:21 christos Exp $ */
+/* $NetBSD: util.h,v 1.6 2021/04/05 11:27:03 rillig Exp $ */
/*
* Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -43,14 +43,14 @@
do { \
v = *w; \
w++; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GET16(v, w) \
do { \
v = (unsigned int)w[0] << 8; \
v |= (unsigned int)w[1]; \
w += 2; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GET24(v, w) \
do { \
@@ -58,7 +58,7 @@
v |= (unsigned int)w[1] << 8; \
v |= (unsigned int)w[2]; \
w += 3; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GET32(v, w) \
do { \
@@ -67,7 +67,7 @@
v |= (unsigned int)w[2] << 8; \
v |= (unsigned int)w[3]; \
w += 4; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GET64(v, w) \
do { \
@@ -80,7 +80,7 @@
v |= (uint64_t)w[6] << 8; \
v |= (uint64_t)w[7]; \
w += 8; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GETC16(v, w, d) \
do { \
@@ -92,7 +92,7 @@
if (v == 255) \
GET16(v, w); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GETC32(v, w) \
do { \
@@ -100,7 +100,7 @@
if (v == 0xffffffu) { \
GET32(v, w); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GET_OFFSET(v, w) GET32(v, w)
@@ -108,7 +108,7 @@
do { \
memmove(v, w, c); \
w += c; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define GET_TYPE(v, w) \
do { \
@@ -120,20 +120,20 @@
GET32(v, w); \
} \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PUT8(v, w) \
do { \
*w = (v & 0x000000ffU); \
w++; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PUT16(v, w) \
do { \
w[0] = (v & 0x0000ff00U) >> 8; \
w[1] = (v & 0x000000ffU); \
w += 2; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PUT24(v, w) \
do { \
@@ -141,7 +141,7 @@
w[1] = (v & 0x0000ff00U) >> 8; \
w[2] = (v & 0x000000ffU); \
w += 3; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PUT32(v, w) \
do { \
@@ -150,7 +150,7 @@
w[2] = (v & 0x0000ff00U) >> 8; \
w[3] = (v & 0x000000ffU); \
w += 4; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PUT64(v, w) \
do { \
@@ -163,7 +163,7 @@
w[6] = (v & 0x000000000000ff00ULL) >> 8; \
w[7] = (v & 0x00000000000000ffULL); \
w += 8; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PUTC16(v, w) \
do { \
@@ -173,7 +173,7 @@
PUT8(255, w); \
PUT16(v, w); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PUTC32(v, w) \
do { \
@@ -183,7 +183,7 @@
PUT24(0xffffffU, w); \
PUT32(v, w); \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PUT_OFFSET(v, w) PUT32(v, w)
@@ -193,7 +193,7 @@
do { \
memmove(w, s, c); \
w += c; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* Regions.
@@ -204,7 +204,7 @@
do { \
(r).rstart = (unsigned char *)s; \
(r).rend = (r).rstart + strlen(s); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Use this to remove the const qualifier of a variable to assign it to
@@ -222,6 +222,6 @@
} _u; \
_u.k = konst; \
var = _u.v; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#endif /* ISCCC_UTIL_H */
Index: src/external/mpl/bind/dist/lib/isccfg/namedconf.c
diff -u src/external/mpl/bind/dist/lib/isccfg/namedconf.c:1.9 src/external/mpl/bind/dist/lib/isccfg/namedconf.c:1.10
--- src/external/mpl/bind/dist/lib/isccfg/namedconf.c:1.9 Fri Feb 19 16:42:21 2021
+++ src/external/mpl/bind/dist/lib/isccfg/namedconf.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: namedconf.c,v 1.9 2021/02/19 16:42:21 christos Exp $ */
+/* $NetBSD: namedconf.c,v 1.10 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -41,14 +41,14 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*% Clean up a configuration object if non-NULL. */
#define CLEANUP_OBJ(obj) \
do { \
if ((obj) != NULL) \
cfg_obj_destroy(pctx, &(obj)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Forward declarations of static functions.
Index: src/external/mpl/bind/dist/lib/isccfg/parser.c
diff -u src/external/mpl/bind/dist/lib/isccfg/parser.c:1.10 src/external/mpl/bind/dist/lib/isccfg/parser.c:1.11
--- src/external/mpl/bind/dist/lib/isccfg/parser.c:1.10 Fri Feb 19 16:42:21 2021
+++ src/external/mpl/bind/dist/lib/isccfg/parser.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.10 2021/02/19 16:42:21 christos Exp $ */
+/* $NetBSD: parser.c,v 1.11 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -53,14 +53,14 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/* Clean up a configuration object if non-NULL. */
#define CLEANUP_OBJ(obj) \
do { \
if ((obj) != NULL) \
cfg_obj_destroy(pctx, &(obj)); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* Forward declarations of static functions.
Index: src/external/mpl/bind/dist/lib/isccfg/tests/duration_test.c
diff -u src/external/mpl/bind/dist/lib/isccfg/tests/duration_test.c:1.3 src/external/mpl/bind/dist/lib/isccfg/tests/duration_test.c:1.4
--- src/external/mpl/bind/dist/lib/isccfg/tests/duration_test.c:1.3 Fri Feb 19 16:42:22 2021
+++ src/external/mpl/bind/dist/lib/isccfg/tests/duration_test.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: duration_test.c,v 1.3 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: duration_test.c,v 1.4 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -41,7 +41,7 @@
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_mem_t *mctx = NULL;
isc_log_t *lctx = NULL;
Index: src/external/mpl/bind/dist/lib/isccfg/tests/parser_test.c
diff -u src/external/mpl/bind/dist/lib/isccfg/tests/parser_test.c:1.7 src/external/mpl/bind/dist/lib/isccfg/tests/parser_test.c:1.8
--- src/external/mpl/bind/dist/lib/isccfg/tests/parser_test.c:1.7 Fri Feb 19 16:42:22 2021
+++ src/external/mpl/bind/dist/lib/isccfg/tests/parser_test.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parser_test.c,v 1.7 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: parser_test.c,v 1.8 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -43,7 +43,7 @@
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_mem_t *mctx = NULL;
isc_log_t *lctx = NULL;
Index: src/external/mpl/bind/dist/lib/ns/hooks.c
diff -u src/external/mpl/bind/dist/lib/ns/hooks.c:1.6 src/external/mpl/bind/dist/lib/ns/hooks.c:1.7
--- src/external/mpl/bind/dist/lib/ns/hooks.c:1.6 Fri Feb 19 16:42:22 2021
+++ src/external/mpl/bind/dist/lib/ns/hooks.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hooks.c,v 1.6 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: hooks.c,v 1.7 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -46,7 +46,7 @@
if (result != ISC_R_SUCCESS) { \
goto cleanup; \
} \
- } while (/*CONSTCOND*/0)
+ } while (0)
struct ns_plugin {
isc_mem_t *mctx;
Index: src/external/mpl/bind/dist/lib/ns/query.c
diff -u src/external/mpl/bind/dist/lib/ns/query.c:1.11 src/external/mpl/bind/dist/lib/ns/query.c:1.12
--- src/external/mpl/bind/dist/lib/ns/query.c:1.11 Fri Feb 19 16:42:22 2021
+++ src/external/mpl/bind/dist/lib/ns/query.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.11 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: query.c,v 1.12 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -94,7 +94,7 @@
(qctx)->result = r; \
(qctx)->want_restart = false; \
(qctx)->line = __LINE__; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*% Partial answer? */
#define PARTIALANSWER(c) \
@@ -210,7 +210,7 @@ client_trace(ns_client_t *client, int le
INSIST(a == NULL); \
a = b; \
b = NULL; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define RESTORE(a, b) SAVE(a, b)
static bool
Index: src/external/mpl/bind/dist/lib/ns/server.c
diff -u src/external/mpl/bind/dist/lib/ns/server.c:1.5 src/external/mpl/bind/dist/lib/ns/server.c:1.6
--- src/external/mpl/bind/dist/lib/ns/server.c:1.5 Fri Feb 19 16:42:22 2021
+++ src/external/mpl/bind/dist/lib/ns/server.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.5 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: server.c,v 1.6 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -33,7 +33,7 @@
do { \
result = (op); \
RUNTIME_CHECK(result == ISC_R_SUCCESS); \
- } while (/*CONSTCOND*/0)
+ } while (0)
isc_result_t
ns_server_create(isc_mem_t *mctx, ns_matchview_t matchingview,
Index: src/external/mpl/bind/dist/lib/ns/update.c
diff -u src/external/mpl/bind/dist/lib/ns/update.c:1.9 src/external/mpl/bind/dist/lib/ns/update.c:1.10
--- src/external/mpl/bind/dist/lib/ns/update.c:1.9 Fri Feb 19 16:42:22 2021
+++ src/external/mpl/bind/dist/lib/ns/update.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: update.c,v 1.9 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: update.c,v 1.10 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -88,7 +88,7 @@
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Fail unconditionally with result 'code', which must not
@@ -104,7 +104,7 @@
result = (code); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Fail unconditionally and log as a client error.
@@ -127,12 +127,12 @@
isc_result_totext(result)); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PREREQFAILC(code, msg) \
do { \
inc_stats(client, zone, ns_statscounter_updatebadprereq); \
FAILC(code, msg); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FAILN(code, name, msg) \
do { \
@@ -154,12 +154,12 @@
} \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PREREQFAILN(code, name, msg) \
do { \
inc_stats(client, zone, ns_statscounter_updatebadprereq); \
FAILN(code, name, msg); \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FAILNT(code, name, type, msg) \
do { \
@@ -183,12 +183,12 @@
} \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define PREREQFAILNT(code, name, type, msg) \
do { \
inc_stats(client, zone, ns_statscounter_updatebadprereq); \
FAILNT(code, name, type, msg); \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*%
* Fail unconditionally and log as a server error.
@@ -202,7 +202,7 @@
msg, isc_result_totext(result)); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/*
* Return TRUE if NS_CLIENTATTR_TCP is set in the attributes other FALSE.
Index: src/external/mpl/bind/dist/lib/ns/xfrout.c
diff -u src/external/mpl/bind/dist/lib/ns/xfrout.c:1.9 src/external/mpl/bind/dist/lib/ns/xfrout.c:1.10
--- src/external/mpl/bind/dist/lib/ns/xfrout.c:1.9 Fri Feb 19 16:42:22 2021
+++ src/external/mpl/bind/dist/lib/ns/xfrout.c Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xfrout.c,v 1.9 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: xfrout.c,v 1.10 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -83,7 +83,7 @@
isc_result_totext(code)); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define FAILQ(code, msg, question, rdclass) \
do { \
@@ -98,14 +98,14 @@
_buf1, _buf2, msg, isc_result_totext(code)); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
#define CHECK(op) \
do { \
result = (op); \
if (result != ISC_R_SUCCESS) \
goto failure; \
- } while (/*CONSTCOND*/0)
+ } while (0)
/**************************************************************************/
Index: src/external/mpl/bind/dist/lib/ns/tests/nstest.h
diff -u src/external/mpl/bind/dist/lib/ns/tests/nstest.h:1.5 src/external/mpl/bind/dist/lib/ns/tests/nstest.h:1.6
--- src/external/mpl/bind/dist/lib/ns/tests/nstest.h:1.5 Fri Feb 19 16:42:22 2021
+++ src/external/mpl/bind/dist/lib/ns/tests/nstest.h Mon Apr 5 11:27:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nstest.h,v 1.5 2021/02/19 16:42:22 christos Exp $ */
+/* $NetBSD: nstest.h,v 1.6 2021/04/05 11:27:04 rillig Exp $ */
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -47,7 +47,7 @@ typedef struct ns_test_id {
result = (r); \
if (result != ISC_R_SUCCESS) \
goto cleanup; \
- } while (/*CONSTCOND*/0)
+ } while (0)
extern isc_mem_t *mctx;
extern isc_log_t *lctx;
