[src/trunk]: src/external/mpl/bind/dist bind: remove unnecessary local modifi...

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

details:   https://anonhg.NetBSD.org/src/rev/b33987e99027
branches:  trunk
changeset: 1020262:b33987e99027
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Apr 05 11:36:55 2021 +0000

description:
bind: remove unnecessary local modifications

No functional change.

diffstat:

 external/mpl/bind/dist/bin/named/server.c      |  3 ++-
 external/mpl/bind/dist/lib/dns/dnsrps.c        |  3 +--
 external/mpl/bind/dist/lib/dns/dnssec.c        |  4 ++--
 external/mpl/bind/dist/lib/dns/gen.c           |  4 ++--
 external/mpl/bind/dist/lib/dns/peer.c          |  3 ++-
 external/mpl/bind/dist/lib/dns/tests/dnstest.h |  3 +--
 external/mpl/bind/dist/lib/isc/netmgr/udp.c    |  7 ++++---
 7 files changed, 14 insertions(+), 13 deletions(-)

diffs (125 lines):

diff -r a227d00e4cb4 -r b33987e99027 external/mpl/bind/dist/bin/named/server.c
--- a/external/mpl/bind/dist/bin/named/server.c Mon Apr 05 11:29:49 2021 +0000
+++ b/external/mpl/bind/dist/bin/named/server.c Mon Apr 05 11:36:55 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: server.c,v 1.14 2021/04/05 11:29:49 rillig Exp $       */
+/*     $NetBSD: server.c,v 1.15 2021/04/05 11:36:55 rillig Exp $       */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -9198,6 +9198,7 @@
                goto cleanup;
        }
 #endif
+
 #ifdef HAVE_LMDB
        /*
         * Reopen NZD databases.
diff -r a227d00e4cb4 -r b33987e99027 external/mpl/bind/dist/lib/dns/dnsrps.c
--- a/external/mpl/bind/dist/lib/dns/dnsrps.c   Mon Apr 05 11:29:49 2021 +0000
+++ b/external/mpl/bind/dist/lib/dns/dnsrps.c   Mon Apr 05 11:36:55 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dnsrps.c,v 1.6 2021/02/19 16:42:15 christos Exp $      */
+/*     $NetBSD: dnsrps.c,v 1.7 2021/04/05 11:36:55 rillig Exp $        */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -15,7 +15,6 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
-#include <stdlib.h>
 
 #ifdef USE_DNSRPS
 
diff -r a227d00e4cb4 -r b33987e99027 external/mpl/bind/dist/lib/dns/dnssec.c
--- a/external/mpl/bind/dist/lib/dns/dnssec.c   Mon Apr 05 11:29:49 2021 +0000
+++ b/external/mpl/bind/dist/lib/dns/dnssec.c   Mon Apr 05 11:36:55 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dnssec.c,v 1.8 2021/04/05 11:27:01 rillig Exp $        */
+/*     $NetBSD: dnssec.c,v 1.9 2021/04/05 11:36:55 rillig Exp $        */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -360,7 +360,7 @@
        }
 
        ret = dns_rdata_fromstruct(sigrdata, sig.common.rdclass,
-                                 sig.common.rdtype, &sig, buffer);
+                                  sig.common.rdtype, &sig, buffer);
 
 cleanup_array:
        isc_mem_put(mctx, rdatas, nrdatas * sizeof(dns_rdata_t));
diff -r a227d00e4cb4 -r b33987e99027 external/mpl/bind/dist/lib/dns/gen.c
--- a/external/mpl/bind/dist/lib/dns/gen.c      Mon Apr 05 11:29:49 2021 +0000
+++ b/external/mpl/bind/dist/lib/dns/gen.c      Mon Apr 05 11:36:55 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gen.c,v 1.8 2021/04/05 11:27:02 rillig Exp $   */
+/*     $NetBSD: gen.c,v 1.9 2021/04/05 11:36:55 rillig Exp $   */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -814,7 +814,7 @@
                fprintf(stdout, "\t\t\t*(_tp) = _d; \\\n");
                fprintf(stdout, "\t\t\treturn (ISC_R_SUCCESS); \\\n");
                fprintf(stdout, "\t\t} \\\n");
-               fprintf(stdout, "\t} while (/*CONSTCOND*/0)\n\n");
+               fprintf(stdout, "\t} while (0)\n\n");
 
                fprintf(stdout, "#define RDATATYPE_FROMTEXT_SW(_hash,"
                                "_typename,_length,_typep) \\\n");
diff -r a227d00e4cb4 -r b33987e99027 external/mpl/bind/dist/lib/dns/peer.c
--- a/external/mpl/bind/dist/lib/dns/peer.c     Mon Apr 05 11:29:49 2021 +0000
+++ b/external/mpl/bind/dist/lib/dns/peer.c     Mon Apr 05 11:36:55 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: peer.c,v 1.7 2021/04/05 10:19:34 rillig Exp $  */
+/*     $NetBSD: peer.c,v 1.8 2021/04/05 11:36:55 rillig Exp $  */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -215,6 +215,7 @@
        REQUIRE(peerptr != NULL && *peerptr == NULL);
 
        peer = isc_mem_get(mem, sizeof(*peer));
+
        *peer = (dns_peer_t){
                .magic = DNS_PEER_MAGIC,
                .address = *addr,
diff -r a227d00e4cb4 -r b33987e99027 external/mpl/bind/dist/lib/dns/tests/dnstest.h
--- a/external/mpl/bind/dist/lib/dns/tests/dnstest.h    Mon Apr 05 11:29:49 2021 +0000
+++ b/external/mpl/bind/dist/lib/dns/tests/dnstest.h    Mon Apr 05 11:36:55 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dnstest.h,v 1.5 2021/02/19 16:42:18 christos Exp $     */
+/*     $NetBSD: dnstest.h,v 1.6 2021/04/05 11:36:55 rillig Exp $       */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -29,7 +29,6 @@
 #include <dns/result.h>
 #include <dns/zone.h>
 
-
 typedef struct {
        dns_diffop_t op;
        const char *owner;
diff -r a227d00e4cb4 -r b33987e99027 external/mpl/bind/dist/lib/isc/netmgr/udp.c
--- a/external/mpl/bind/dist/lib/isc/netmgr/udp.c       Mon Apr 05 11:29:49 2021 +0000
+++ b/external/mpl/bind/dist/lib/isc/netmgr/udp.c       Mon Apr 05 11:36:55 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: udp.c,v 1.6 2021/04/05 10:19:34 rillig Exp $   */
+/*     $NetBSD: udp.c,v 1.7 2021/04/05 11:36:55 rillig Exp $   */
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -542,8 +542,9 @@
        }
 
        if (isc_nm_tid() == rsock->tid) {
-               isc__netievent_udpsend_t ievent
-               = { .sock = rsock, .req = uvreq, .peer = *peer };
+               isc__netievent_udpsend_t ievent = { .sock = rsock,
+                                                   .req = uvreq,
+                                                   .peer = *peer };
 
                isc__nm_async_udpsend(NULL, (isc__netievent_t *)&ievent);
        } else {