[3824] updated copyrights

diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index f508bf3de4e0bf88dbd6263834385eee8f7df2e6..b8f9d7400fd80aa1d5599bfed6a28149987357cb 100644 (file)
--- a/src/lib/dns/master_loader.cc
+++ b/src/lib/dns/master_loader.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-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
@@ -12,8 +12,6 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <config.h>
-
 #include <dns/master_loader.h>
 #include <dns/master_lexer.h>
 #include <dns/name.h>

diff --git a/src/lib/dns/rdata/generic/detail/char_string.cc b/src/lib/dns/rdata/generic/detail/char_string.cc
index 702ba3072a68b15f6f656af630ac567bffec107f..4fc3eb83cc184441073e25d56427db4996383fc4 100644 (file)
--- a/src/lib/dns/rdata/generic/detail/char_string.cc
+++ b/src/lib/dns/rdata/generic/detail/char_string.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012, 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/src/lib/dns/rdataclass.cc b/src/lib/dns/rdataclass.cc
index 5a2ceb157438725fb5402147d3d6a1fde78aab83..8bc97642af3e439584696c8539c4df8e724fdde7 100644 (file)
--- a/src/lib/dns/rdataclass.cc
+++ b/src/lib/dns/rdataclass.cc
@@ -1856,7 +1856,7 @@ DNSKEY::compare(const Rdata& other) const {
     const size_t other_len = other_dnskey.impl_->keydata_.size();
     const size_t cmplen = min(this_len, other_len);
     if (cmplen == 0) {
-      return ((this_len == other_len) ? 0 : (this_len < other_len) ? -1 : 1);
+        return ((this_len == other_len) ? 0 : (this_len < other_len) ? -1 : 1);
     }
     const int cmp = memcmp(&impl_->keydata_[0],
                            &other_dnskey.impl_->keydata_[0], cmplen);