update copyright notice / whitespace

diff --git a/bin/tests/system/statistics/Makefile.in b/bin/tests/system/statistics/Makefile.in
index 1d7a22bd32552ef1514a1a6f9fa73dc8ac91878f..c1823ad90476f432bc5b8bd530c51b3fb7350f72 100644 (file)
--- a/bin/tests/system/statistics/Makefile.in
+++ b/bin/tests/system/statistics/Makefile.in
@@ -1,16 +1,16 @@
-#Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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
-#copyright notice and this permission notice appear in all copies.
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
-#THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-#REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-#AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-#INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-#LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-#OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-#PERFORMANCE OF THIS SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
 
 srcdir=        @srcdir@
 VPATH=         @srcdir@

diff --git a/lib/dns/opensslgost_link.c b/lib/dns/opensslgost_link.c
index 8fcefe48787b9ee001213ae3910921f18ae862b6..7167a74210db54a8bc30f4b6f114e1aa77d4ff04 100644 (file)
--- a/lib/dns/opensslgost_link.c
+++ b/lib/dns/opensslgost_link.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010-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/pkcs11ecdsa_link.c b/lib/dns/pkcs11ecdsa_link.c
index bca32b1cba61a792e6f893ed263bc2ff782f3598..1ec1dee5ea4e13eb5a089ccb76b7c5ea61783898 100644 (file)
--- a/lib/dns/pkcs11ecdsa_link.c
+++ b/lib/dns/pkcs11ecdsa_link.c
@@ -1,5 +1,5 @@
 /*
- * 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/pkcs11gost_link.c b/lib/dns/pkcs11gost_link.c
index ff728005f13aa9d9b0cc19e227bfa2556b9059b4..73bfb9206d80c92aca87d41fcbfef1fda2b9b921 100644 (file)
--- a/lib/dns/pkcs11gost_link.c
+++ b/lib/dns/pkcs11gost_link.c
@@ -1,5 +1,5 @@
 /*
- * 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/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index f2a0b11d9d40d41b25203be09ec7dbdb0d62d9e2..dce6b43f514d2bf56322b214b587d0cde8e8ff3d 100644 (file)
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000, 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/hmacsha.c b/lib/isc/hmacsha.c
index db42cda2950cab34dcd996eb150e37779b011c0b..6a6e46a2892bdf6247615c65712145c50ec17832 100644 (file)
--- a/lib/isc/hmacsha.c
+++ b/lib/isc/hmacsha.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007, 2009, 2011-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005-2007, 2009, 2011-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/isc/include/isc/safe.h b/lib/isc/include/isc/safe.h
index b2495e962fdfd0a3643eea9acf54c88d7aabf92b..c6a3033525513939875b307a4d185c1f14a5643c 100644 (file)
--- a/lib/isc/include/isc/safe.h
+++ b/lib/isc/include/isc/safe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 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/isc/safe.c b/lib/isc/safe.c
index 891eaf0e802f4e00ef1c8fee842a629c0e4f1316..8ac4a5b9193faf859bff539807a8246dd6d50ada 100644 (file)
--- a/lib/isc/safe.c
+++ b/lib/isc/safe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 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
@@ -42,26 +42,26 @@ isc_safe_memequal(const void *s1, const void *s2, size_t n) {
 
 int
 isc_safe_memcompare(const void *b1, const void *b2, size_t len) {
-        const unsigned char *p1 = b1, *p2 = b2;
-        size_t i;
-        int res = 0, done = 0;
+       const unsigned char *p1 = b1, *p2 = b2;
+       size_t i;
+       int res = 0, done = 0;
 
-        for (i = 0; i < len; i++) {
-                /* lt is -1 if p1[i] < p2[i]; else 0. */
-                int lt = (p1[i] - p2[i]) >> CHAR_BIT;
+       for (i = 0; i < len; i++) {
+               /* lt is -1 if p1[i] < p2[i]; else 0. */
+               int lt = (p1[i] - p2[i]) >> CHAR_BIT;
 
-                /* gt is -1 if p1[i] > p2[i]; else 0. */
-                int gt = (p2[i] - p1[i]) >> CHAR_BIT;
+               /* gt is -1 if p1[i] > p2[i]; else 0. */
+               int gt = (p2[i] - p1[i]) >> CHAR_BIT;
 
-                /* cmp is 1 if p1[i] > p2[i]; -1 if p1[i] < p2[i]; else 0. */
-                int cmp = lt - gt;
+               /* cmp is 1 if p1[i] > p2[i]; -1 if p1[i] < p2[i]; else 0. */
+               int cmp = lt - gt;
 
-                /* set res = cmp if !done. */
-                res |= cmp & ~done;
+               /* set res = cmp if !done. */
+               res |= cmp & ~done;
 
-                /* set done if p1[i] != p2[i]. */
-                done |= lt | gt;
-        }
+               /* set done if p1[i] != p2[i]. */
+               done |= lt | gt;
+       }
 
-        return (res);
+       return (res);
 }

diff --git a/lib/isc/tests/safe_test.c b/lib/isc/tests/safe_test.c
index 113ec8efc5b35890997189fba070bef75d24b098..377d2ced978fb63b4830959d6a3bcdbbb590614a 100644 (file)
--- a/lib/isc/tests/safe_test.c
+++ b/lib/isc/tests/safe_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 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