update copyright notice / whitespace

diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c
index ff7ec7b69aa577c900fff8b7f51e30cb96b5fccc..a77027e6334ce5eb3c7645fd4fc820cd21a24e6e 100644 (file)
--- a/bin/tools/dnstap-read.c
+++ b/bin/tools/dnstap-read.c
@@ -13,6 +13,7 @@
  * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /*
  * Portions of this code were adapted from dnstap-ldns:
  *
@@ -60,7 +61,7 @@ const char *program = "dnstap-read";
        do { result = (op);                                       \
               if (result != ISC_R_SUCCESS) {                     \
                        fprintf(stderr,                           \
-                               "%s: %s: %s\n", program, msg,     \
+                               "%s: %s: %s\n", program, msg,     \
                                      isc_result_totext(result)); \
                        goto cleanup;                             \
                }                                                 \

diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
index 069b1fe59b7e760cdc839c3d346a0abb02d62c43..e6c5e1452932808b430c47b861bebdfba1c0a283 100644 (file)
--- a/lib/dns/dnstap.c
+++ b/lib/dns/dnstap.c
@@ -819,7 +819,7 @@ dns_dt_parse(isc_mem_t *mctx, isc_region_t *src, dns_dtdata_t **destp) {
        }
 
        /* Query? */
-       if ((d->type & DNS_DTTYPE_QUERY) != 0) 
+       if ((d->type & DNS_DTTYPE_QUERY) != 0)
                d->query = ISC_TRUE;
        else
                d->query = ISC_FALSE;
@@ -871,10 +871,10 @@ dns_dt_parse(isc_mem_t *mctx, isc_region_t *src, dns_dtdata_t **destp) {
                        protobuf_c_enum_descriptor_get_value(
                                &dnstap__socket_protocol__descriptor,
                                m->socket_protocol);
-               if (type != NULL && 
+               if (type != NULL &&
                    type->value == DNSTAP__SOCKET_PROTOCOL__TCP)
                        d->tcp = ISC_TRUE;
-               else 
+               else
                        d->tcp = ISC_FALSE;
        }
 
@@ -1019,7 +1019,7 @@ dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest) {
 
        if (d->typebuf[0] == '\0')
                CHECK(putstr(dest, "?"));
-       else 
+       else
                CHECK(putstr(dest, d->typebuf));
 
        CHECK(isc_buffer_reserve(dest, 1));

diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h
index 3e8a60686c4df82a7534cd8f7f8e404422ac1e5b..e686b722dd53c99dfa3671eb566a3c8e57e0cde2 100644 (file)
--- a/lib/dns/include/dns/dnstap.h
+++ b/lib/dns/include/dns/dnstap.h
@@ -141,7 +141,7 @@ dns_dt_create(isc_mem_t *mctx, dns_dtmode_t mode, const char *path,
  *
  * Notes:
  *
- *\li  'path' refers to a UNIX domain socket by default. It may 
+ *\li  'path' refers to a UNIX domain socket by default. It may
  *     optionally be prepended with "socket:" or "file:". If prepended
  *     with "file:", then dnstap logs are sent to a file instead of a
  *     socket.
@@ -235,7 +235,7 @@ dns_dt_send(dns_view_t *view, dns_dtmsgtype_t msgtype,
  *
  * Requires:
  *
- *\li  'view' is a valid view, and 'view->dtenv' is NULL or is a 
+ *\li  'view' is a valid view, and 'view->dtenv' is NULL or is a
  *     valid dnstap environment.
  */
 
@@ -261,7 +261,7 @@ dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest);
 /*%<
  * Converts a parsed dnstap data structure 'd' to text, storing
  * the result in the buffer 'dest'.  If 'dest' points to a dynamically
- * allocated buffer, then it may be reallocated as needed. 
+ * allocated buffer, then it may be reallocated as needed.
  *
  * (XXX: add a 'long_form' option to generate a detailed listing of
  * dnstap data instead * of a one-line summary.)
@@ -324,7 +324,7 @@ dns_dt_getframe(dns_dthandle_t *handle, isc_uint8_t **bufp, size_t *sizep);
  *\li  'bufp' is not NULL
  *\li  'sizep' is not NULL
  *
- * Ensures: 
+ * Ensures:
  * \li if returning ISC_R_SUCCESS then '*bufp' is not NULL
  *
  * Returns:

diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index 4c5344340dec5860b31eabc076aaae91e0eb0b54..c952c825a7bef4e2e881e278b49c3fcad4f21db6 100644 (file)
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008, 2011, 2013, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/tests/dnstest.h b/lib/dns/tests/dnstest.h
index 12aa34d7992ac8ac97907a46df61a04066a43ecd..ba749738af68a117b8bb816a26a1c671d0c6cf19 100644 (file)
--- a/lib/dns/tests/dnstest.h
+++ b/lib/dns/tests/dnstest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012, 2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2012, 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/include/isc/task.h b/lib/isc/include/isc/task.h
index c6ff940f19ea1357480fcc40effdb63aeb95dc8c..0aa9afc31f5570a32d3ca7ab837083347f506f5a 100644 (file)
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007, 2009-2014  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009-2015  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any