From: Tinderbox User <tbox@isc.org>
Date: Wed, 9 Dec 2015 23:45:23 +0000 (+0000)
Subject: update copyright notice / whitespace
X-Git-Tag: v9.11.0a1~268
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2a3747006563cfa1c07516ec594cc6d1f0db7ff2;p=thirdparty%2Fbind9.git

update copyright notice / whitespace
---

diff --git a/bin/tests/system/ednscompliance/tests.sh b/bin/tests/system/ednscompliance/tests.sh
index 2050f7177af..b8f3b9a3bdb 100644
--- 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 e59abacbff8..4193b2f5061 100644
--- 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 fc886e020bc..68f3180edd3 100644
--- 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 015dcdbc9d9..686169eff3b 100644
--- 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 77640be6394..b8cf8cfb764 100644
--- 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]);