Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mpl/bind/dist bind: remove unnecessary CONSTCOND co...



details:   https://anonhg.NetBSD.org/src/rev/de969280f2cb
branches:  trunk
changeset: 1020260:de969280f2cb
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Apr 05 11:26:59 2021 +0000

description:
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.

diffstat:

 external/mpl/bind/dist/bin/check/check-tool.c                   |   4 +-
 external/mpl/bind/dist/bin/check/named-checkconf.c              |   4 +-
 external/mpl/bind/dist/bin/check/named-checkzone.c              |   4 +-
 external/mpl/bind/dist/bin/confgen/util.h                       |   4 +-
 external/mpl/bind/dist/bin/delv/delv.c                          |   6 +-
 external/mpl/bind/dist/bin/dig/dig.c                            |   6 +-
 external/mpl/bind/dist/bin/named/controlconf.c                  |   4 +-
 external/mpl/bind/dist/bin/named/logconf.c                      |   4 +-
 external/mpl/bind/dist/bin/named/server.c                       |  12 +-
 external/mpl/bind/dist/bin/named/statschannel.c                 |  14 +-
 external/mpl/bind/dist/bin/named/tkeyconf.c                     |   4 +-
 external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c       |   6 +-
 external/mpl/bind/dist/bin/named/unix/os.c                      |   8 +-
 external/mpl/bind/dist/bin/named/win32/dlz_dlopen_driver.c      |   6 +-
 external/mpl/bind/dist/bin/named/zoneconf.c                     |   6 +-
 external/mpl/bind/dist/bin/rndc/util.h                          |   4 +-
 external/mpl/bind/dist/bin/tests/makejournal.c                  |   4 +-
 external/mpl/bind/dist/bin/tests/system/dlzexternal/driver.c    |   4 +-
 external/mpl/bind/dist/bin/tests/system/rsabigexponent/bigkey.c |   4 +-
 external/mpl/bind/dist/contrib/dlz/example/dlz_example.c        |   4 +-
 external/mpl/bind/dist/contrib/dlz/modules/include/dlz_list.h   |   8 +-
 external/mpl/bind/dist/lib/bind9/check.c                        |   6 +-
 external/mpl/bind/dist/lib/dns/adb.c                            |   8 +-
 external/mpl/bind/dist/lib/dns/cache.c                          |   4 +-
 external/mpl/bind/dist/lib/dns/client.c                         |   4 +-
 external/mpl/bind/dist/lib/dns/diff.c                           |   4 +-
 external/mpl/bind/dist/lib/dns/dnssec.c                         |   4 +-
 external/mpl/bind/dist/lib/dns/dnstap.c                         |   4 +-
 external/mpl/bind/dist/lib/dns/dst_api.c                        |   6 +-
 external/mpl/bind/dist/lib/dns/dst_parse.c                      |   4 +-
 external/mpl/bind/dist/lib/dns/dyndb.c                          |   4 +-
 external/mpl/bind/dist/lib/dns/gen.c                            |   4 +-
 external/mpl/bind/dist/lib/dns/gssapi_link.c                    |   6 +-
 external/mpl/bind/dist/lib/dns/gssapictx.c                      |   8 +-
 external/mpl/bind/dist/lib/dns/include/dns/name.h               |  10 +-
 external/mpl/bind/dist/lib/dns/journal.c                        |   6 +-
 external/mpl/bind/dist/lib/dns/keymgr.c                         |   6 +-
 external/mpl/bind/dist/lib/dns/master.c                         |  12 +-
 external/mpl/bind/dist/lib/dns/masterdump.c                     |   8 +-
 external/mpl/bind/dist/lib/dns/message.c                        |   6 +-
 external/mpl/bind/dist/lib/dns/name.c                           |   4 +-
 external/mpl/bind/dist/lib/dns/nsec.c                           |   4 +-
 external/mpl/bind/dist/lib/dns/nsec3.c                          |   4 +-
 external/mpl/bind/dist/lib/dns/private.c                        |   4 +-
 external/mpl/bind/dist/lib/dns/rbt.c                            |   6 +-
 external/mpl/bind/dist/lib/dns/rbtdb.c                          |   4 +-
 external/mpl/bind/dist/lib/dns/rcode.c                          |   4 +-
 external/mpl/bind/dist/lib/dns/rdata.c                          |  10 +-
 external/mpl/bind/dist/lib/dns/rdata/in_1/wks_11.c              |   4 +-
 external/mpl/bind/dist/lib/dns/rdata/rdatastructpre.h           |   4 +-
 external/mpl/bind/dist/lib/dns/resolver.c                       |  20 ++--
 external/mpl/bind/dist/lib/dns/sdb.c                            |   6 +-
 external/mpl/bind/dist/lib/dns/sdlz.c                           |   6 +-
 external/mpl/bind/dist/lib/dns/spnego_asn1.c                    |   4 +-
 external/mpl/bind/dist/lib/dns/tests/dnstest.c                  |   4 +-
 external/mpl/bind/dist/lib/dns/tests/tsig_test.c                |   4 +-
 external/mpl/bind/dist/lib/dns/time.c                           |   4 +-
 external/mpl/bind/dist/lib/dns/timer.c                          |   4 +-
 external/mpl/bind/dist/lib/dns/tkey.c                           |   4 +-
 external/mpl/bind/dist/lib/dns/ttl.c                            |   4 +-
 external/mpl/bind/dist/lib/dns/update.c                         |  14 +-
 external/mpl/bind/dist/lib/dns/view.c                           |   4 +-
 external/mpl/bind/dist/lib/dns/xfrin.c                          |   6 +-
 external/mpl/bind/dist/lib/dns/zone.c                           |  18 +-
 external/mpl/bind/dist/lib/irs/getnameinfo.c                    |   4 +-
 external/mpl/bind/dist/lib/isc/base32.c                         |   4 +-
 external/mpl/bind/dist/lib/isc/base64.c                         |   4 +-
 external/mpl/bind/dist/lib/isc/hex.c                            |   4 +-
 external/mpl/bind/dist/lib/isc/include/isc/buffer.h             |  46 +++++-----
 external/mpl/bind/dist/lib/isc/include/isc/event.h              |   4 +-
 external/mpl/bind/dist/lib/isc/include/isc/list.h               |  30 +++---
 external/mpl/bind/dist/lib/isc/include/isc/mem.h                |  10 +-
 external/mpl/bind/dist/lib/isc/include/isc/region.h             |   8 +-
 external/mpl/bind/dist/lib/isc/include/isc/util.h               |  18 +-
 external/mpl/bind/dist/lib/isc/mem.c                            |   8 +-
 external/mpl/bind/dist/lib/isc/pthreads/mutex.c                 |   6 +-
 external/mpl/bind/dist/lib/isc/regex.c                          |   4 +-
 external/mpl/bind/dist/lib/isc/task.c                           |   6 +-
 external/mpl/bind/dist/lib/isc/tests/isctest.h                  |   4 +-
 external/mpl/bind/dist/lib/isc/unix/socket.c                    |   6 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/mutex.h        |   4 +-
 external/mpl/bind/dist/lib/isc/win32/include/isc/net.h          |   6 +-
 external/mpl/bind/dist/lib/isc/win32/ntgroups.c                 |   4 +-
 external/mpl/bind/dist/lib/isc/win32/socket.c                   |  10 +-
 external/mpl/bind/dist/lib/isccc/include/isccc/util.h           |  40 ++++----
 external/mpl/bind/dist/lib/isccfg/namedconf.c                   |   6 +-
 external/mpl/bind/dist/lib/isccfg/parser.c                      |   6 +-
 external/mpl/bind/dist/lib/isccfg/tests/duration_test.c         |   4 +-
 external/mpl/bind/dist/lib/isccfg/tests/parser_test.c           |   4 +-
 external/mpl/bind/dist/lib/ns/hooks.c                           |   4 +-
 external/mpl/bind/dist/lib/ns/query.c                           |   6 +-
 external/mpl/bind/dist/lib/ns/server.c                          |   4 +-
 external/mpl/bind/dist/lib/ns/tests/nstest.h                    |   4 +-
 external/mpl/bind/dist/lib/ns/update.c                          |  20 ++--
 external/mpl/bind/dist/lib/ns/xfrout.c                          |   8 +-
 95 files changed, 340 insertions(+), 340 deletions(-)

diffs (truncated from 2942 to 300 lines):

diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/check/check-tool.c
--- a/external/mpl/bind/dist/bin/check/check-tool.c     Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/check/check-tool.c     Mon Apr 05 11:26:59 2021 +0000
@@ -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
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/check/named-checkconf.c
--- a/external/mpl/bind/dist/bin/check/named-checkconf.c        Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/check/named-checkconf.c        Mon Apr 05 11:26:59 2021 +0000
@@ -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 @@
                result = (r);                \
                if (result != ISC_R_SUCCESS) \
                        goto cleanup;        \
-       } while (/*CONSTCOND*/0)
+       } while (0)
 
 /*% usage */
 ISC_PLATFORM_NORETURN_PRE static void
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/check/named-checkzone.c
--- a/external/mpl/bind/dist/bin/check/named-checkzone.c        Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/check/named-checkzone.c        Mon Apr 05 11:26:59 2021 +0000
@@ -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 @@
                                        function, dns_result_totext(result)); \
                        return (result);                                      \
                }                                                             \
-       } while (/*CONSTCOND*/0)
+       } while (0)
 
 ISC_PLATFORM_NORETURN_PRE static void
 usage(void) ISC_PLATFORM_NORETURN_POST;
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/confgen/util.h
--- a/external/mpl/bind/dist/bin/confgen/util.h Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/confgen/util.h Mon Apr 05 11:26:59 2021 +0000
@@ -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
 
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/delv/delv.c
--- a/external/mpl/bind/dist/bin/delv/delv.c    Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/delv/delv.c    Mon Apr 05 11:26:59 2021 +0000
@@ -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 @@
                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 */
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/dig/dig.c
--- a/external/mpl/bind/dist/bin/dig/dig.c      Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/dig/dig.c      Mon Apr 05 11:26:59 2021 +0000
@@ -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 @@
                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':
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/named/controlconf.c
--- a/external/mpl/bind/dist/bin/named/controlconf.c    Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/controlconf.c    Mon Apr 05 11:26:59 2021 +0000
@@ -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 @@
                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) {
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/named/logconf.c
--- a/external/mpl/bind/dist/bin/named/logconf.c        Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/logconf.c        Mon Apr 05 11:26:59 2021 +0000
@@ -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
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/named/server.c
--- a/external/mpl/bind/dist/bin/named/server.c Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/server.c Mon Apr 05 11:26:59 2021 +0000
@@ -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
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/named/statschannel.c
--- a/external/mpl/bind/dist/bin/named/statschannel.c   Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/statschannel.c   Mon Apr 05 11:26:59 2021 +0000
@@ -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 @@
                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 @@
                         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 @@
                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 @@
                         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 @@
                         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 @@
                         desc, dnssecstats_desc, xmldesc,                  \
                         dnssecstats_xmldesc);                             \
                dnssecstats_index[i++] = dns_dnssecstats_##counterid;      \
-       } while (/*CONSTCOND*/0)
+       } while (0)
 
        i = 0;
        SET_DNSSECSTATDESC(asis,
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/named/tkeyconf.c
--- a/external/mpl/bind/dist/bin/named/tkeyconf.c       Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/tkeyconf.c       Mon Apr 05 11:26:59 2021 +0000
@@ -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)                                               \
diff -r df7d3a4085bd -r de969280f2cb external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c
--- a/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c Mon Apr 05 10:54:05 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/unix/dlz_dlopen_driver.c Mon Apr 05 11:26:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dlz_dlopen_driver.c,v 1.8 2021/02/19 16:42:10 christos Exp $   */



Home | Main Index | Thread Index | Old Index