update copyright notice / whitespace

diff --git a/bin/tests/system/ednscompliance/tests.sh b/bin/tests/system/ednscompliance/tests.sh
index 2050f7177afb9f8bd9459450ec6a9bf0873f006c..b8f3b9a3bdbf3f9177f3e1fa9f7021e8f51ef2a0 100644 (file)
--- a/bin/tests/system/ednscompliance/tests.sh
+++ b/bin/tests/system/ednscompliance/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2015  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

diff --git a/lib/dns/db.c b/lib/dns/db.c
index e59abacbff8a24c71b2738a2bf8b56e8596b321a..4193b2f506160e8ed0ec1173265f7f5bee27c823 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009, 2011-2013, 2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/name.c b/lib/dns/name.c
index fc886e020bccc9925e61d0306ae148a627ee0495..68f3180edd318ccc490bb54a9dec65bd9aca67a4 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -763,16 +763,16 @@ dns_name_equal(const dns_name_t *name1, const dns_name_t *name2) {
 
                /* Loop unrolled for performance */
                while (count > 3) {
-                       c = maptolower[label1[0]];
+                       c = maptolower[label1[0]];
                        if (c != maptolower[label2[0]])
                                return (ISC_FALSE);
-                       c = maptolower[label1[1]];
+                       c = maptolower[label1[1]];
                        if (c != maptolower[label2[1]])
                                return (ISC_FALSE);
-                       c = maptolower[label1[2]];
+                       c = maptolower[label1[2]];
                        if (c != maptolower[label2[2]])
                                return (ISC_FALSE);
-                       c = maptolower[label1[3]];
+                       c = maptolower[label1[3]];
                        if (c != maptolower[label2[3]])
                                return (ISC_FALSE);
                        count -= 4;

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 015dcdbc9d9e52369ce0901f5fe2cb23b4d57bd7..686169eff3b613afd7243005ede59830e1b530f2 100644 (file)
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -1384,10 +1384,10 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) {
 
        if (result == ISC_R_SUCCESS) {
 #ifdef DNS_RBT_USEHASH
-               if (*root == NULL)
-                       UPPERNODE(new_current) = current;
+               if (*root == NULL)
+                       UPPERNODE(new_current) = current;
                else
-                       UPPERNODE(new_current) = PARENT(*root);
+                       UPPERNODE(new_current) = PARENT(*root);
 #endif /* DNS_RBT_USEHASH */
                addonlevel(new_current, current, order, root);
                rbt->nodecount++;

diff --git a/lib/dns/tests/rbt_test.c b/lib/dns/tests/rbt_test.c
index 77640be63940ae548b2619df889ad7bcd27fa895..b8cf8cfb764ca8f975f5945070a36401d97c7515 100644 (file)
--- a/lib/dns/tests/rbt_test.c
+++ b/lib/dns/tests/rbt_test.c
@@ -1380,7 +1380,7 @@ ATF_TC_BODY(benchmark, tc) {
        values = (int *) malloc(4000000 * sizeof(int));
 
        for (i = 0; i < 4000000; i++) {
-                 r = ((unsigned long) random()) % maxvalue;
+                 r = ((unsigned long) random()) % maxvalue;
                  snprintf(namestr, sizeof(namestr), "name%u.example.org.", r);
                  build_name_from_str(namestr, &fnames[i]);
                  names[i] = dns_fixedname_name(&fnames[i]);