[3860] misc cleanups

diff --git a/src/lib/cc/data.cc b/src/lib/cc/data.cc
index d3e46e1124e13896ad45c7f98520085b3c9fb329..2a511e5939ace26886ab31af39ea2e5201775880 100644 (file)
--- a/src/lib/cc/data.cc
+++ b/src/lib/cc/data.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2010, 2014  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2010, 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
@@ -26,7 +26,6 @@
 #include <sstream>
 #include <fstream>
 #include <cerrno>
-#include <climits>
 
 #include <boost/algorithm/string.hpp> // for iequals
 #include <boost/lexical_cast.hpp>

diff --git a/src/lib/dhcp/pkt_filter_bpf.cc b/src/lib/dhcp/pkt_filter_bpf.cc
index 9db4cb17c8f3eba0f5afa1e0c48bc74e491bf26b..69ef245d062bda682bcc3eff5f54d919b728b85f 100644 (file)
--- a/src/lib/dhcp/pkt_filter_bpf.cc
+++ b/src/lib/dhcp/pkt_filter_bpf.cc
@@ -299,7 +299,7 @@ PktFilterBPF::openSocket(Iface& iface,
                   << ver.bv_major << "." << ver.bv_minor
                   << " Expected at least version:"
                   << BPF_MAJOR_VERSION << "."
-                  << BPF_MINOR_VERSION);;
+                  << BPF_MINOR_VERSION);
     }
 
     // Get the size of the read buffer for this device. We will need to

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index 0afb22149e292060b31fd7c8792a14b8b1e19f2c..470336152607acc0924b1ed24d7201de9c2d3a8b 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -754,7 +754,7 @@ void Memfile_LeaseMgr::loadLeasesFromFiles(const std::string& filename,
     // future lease updates.
     lease_file.reset(new LeaseFileType(filename));
     LeaseFileLoader::load<LeaseObjectType>(*lease_file, storage,
-                                           MAX_LEASE_ERRORS, false);;
+                                           MAX_LEASE_ERRORS, false);
 }
 
 

diff --git a/src/lib/dns/tests/masterload_unittest.cc b/src/lib/dns/tests/masterload_unittest.cc
index 51c999d32a3f2d61e728396cc573c99f56a70cf1..87656c51447b0a795b600905af45ec8bed9375c7 100644 (file)
--- a/src/lib/dns/tests/masterload_unittest.cc
+++ b/src/lib/dns/tests/masterload_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2010  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
@@ -174,7 +174,7 @@ TEST_F(MasterLoadTest, loadRRsigs) {
 TEST_F(MasterLoadTest, DISABLED_loadRRWithComment) {
     // Comment at the end of line should be ignored and the RR should be
     // accepted.
-    rr_stream << "example.com. 3600 IN DNSKEY  256 3 7 "
+    rr_stream << "example.com. 3600 IN DNSKEY\t256 3 7 "
         "AwEAAaetidLzsKWUt4swWR8yu0wPHPiUi8LUsAD0QPWU+wzt89epO6tH "
         "zkMBVDkC7qphQO2hTY4hHn9npWFRw5BYubE=  ; key id = 40430\n";
     masterLoad(rr_stream, origin, zclass, callback);
@@ -191,7 +191,7 @@ TEST_F(MasterLoadTest, DISABLED_loadRRWithComment) {
 TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentNoSpace) {
     // Similar to the previous one, but there's no space before comments.
     // It should still work.
-    rr_stream << "example.com. 3600 IN DNSKEY  256 3 7 "
+    rr_stream << "example.com. 3600 IN DNSKEY\t256 3 7 "
         "AwEAAaetidLzsKWUt4swWR8yu0wPHPiUi8LUsAD0QPWU+wzt89epO6tH "
         "zkMBVDkC7qphQO2hTY4hHn9npWFRw5BYubE=; key id = 40430\n";
     masterLoad(rr_stream, origin, zclass, callback);
@@ -208,7 +208,7 @@ TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentNoSpace) {
 TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentEmptyComment) {
     // Similar to the previous one, but there's no data after the ;
     // It should still work.
-    rr_stream << "example.com. 3600 IN DNSKEY  256 3 7 "
+    rr_stream << "example.com. 3600 IN DNSKEY\t256 3 7 "
         "AwEAAaetidLzsKWUt4swWR8yu0wPHPiUi8LUsAD0QPWU+wzt89epO6tH "
         "zkMBVDkC7qphQO2hTY4hHn9npWFRw5BYubE= ;\n";
     masterLoad(rr_stream, origin, zclass, callback);
@@ -225,7 +225,7 @@ TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentEmptyComment) {
 TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentEmptyCommentNoSpace) {
     // Similar to the previous one, but there's no space before or after ;
     // It should still work.
-    rr_stream << "example.com. 3600 IN DNSKEY  256 3 7 "
+    rr_stream << "example.com. 3600 IN DNSKEY\t256 3 7 "
         "AwEAAaetidLzsKWUt4swWR8yu0wPHPiUi8LUsAD0QPWU+wzt89epO6tH "
         "zkMBVDkC7qphQO2hTY4hHn9npWFRw5BYubE=;\n";
     masterLoad(rr_stream, origin, zclass, callback);