From f21b6da8ff81159edb3efa55fe9c14aefdf76fa2 Mon Sep 17 00:00:00 2001 From: Tinderbox User Date: Wed, 19 Aug 2015 23:45:50 +0000 Subject: [PATCH] update copyright notice / whitespace --- bin/tests/system/statistics/Makefile.in | 22 ++++++++-------- lib/dns/opensslgost_link.c | 2 +- lib/dns/pkcs11ecdsa_link.c | 2 +- lib/dns/pkcs11gost_link.c | 2 +- lib/isc/hmacmd5.c | 2 +- lib/isc/hmacsha.c | 2 +- lib/isc/include/isc/safe.h | 2 +- lib/isc/safe.c | 34 ++++++++++++------------- lib/isc/tests/safe_test.c | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/bin/tests/system/statistics/Makefile.in b/bin/tests/system/statistics/Makefile.in index 1d7a22bd32..c1823ad904 100644 --- 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 8fcefe4878..7167a74210 100644 --- 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 bca32b1cba..1ec1dee5ea 100644 --- 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 ff728005f1..73bfb9206d 100644 --- 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 f2a0b11d9d..dce6b43f51 100644 --- 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 db42cda295..6a6e46a289 100644 --- 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 b2495e962f..c6a3033525 100644 --- 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 891eaf0e80..8ac4a5b919 100644 --- 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 113ec8efc5..377d2ced97 100644 --- 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