From: Francis Dupont <fdupont@isc.org>
Date: Tue, 12 May 2015 15:14:55 +0000 (+0200)
Subject: [3824] updated copyrights
X-Git-Tag: trac3919_base~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=041f9682144c5bfd458a5c70be7462b7dcce78b4;p=thirdparty%2Fkea.git

[3824] updated copyrights
---

diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index f508bf3de4..b8f9d7400f 100644
--- 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 702ba3072a..4fc3eb83cc 100644
--- 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 5a2ceb1574..8bc97642af 100644
--- 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);