[#1308] review changes

diff --git a/src/hooks/dhcp/high_availability/tests/ha_test.cc b/src/hooks/dhcp/high_availability/tests/ha_test.cc
index bfe2ab18c04a6b4aa0d1d25b4e4963b067a81552..a8ee67d1f025ca89a85c62ec36c6083b692a38a6 100644 (file)
--- a/src/hooks/dhcp/high_availability/tests/ha_test.cc
+++ b/src/hooks/dhcp/high_availability/tests/ha_test.cc
@@ -102,7 +102,7 @@ HATest::runIOServiceInThread() {
     std::condition_variable condvar;
 
     io_service_->post(std::bind(&HATest::signalServiceRunning, this, std::ref(running),
-                                  std::ref(mutex), std::ref(condvar)));
+                                std::ref(mutex), std::ref(condvar)));
     boost::shared_ptr<std::thread>
         th(new std::thread(std::bind(&IOService::run, io_service_.get())));
 

diff --git a/src/lib/dhcp_ddns/ncr_udp.cc b/src/lib/dhcp_ddns/ncr_udp.cc
index fb33e8e5e6ef4227a29776faa60387318a1e7983..1fcbdd7713a23c57fc67c86bf90b537ec3193aa3 100644 (file)
--- a/src/lib/dhcp_ddns/ncr_udp.cc
+++ b/src/lib/dhcp_ddns/ncr_udp.cc
@@ -74,10 +74,9 @@ NameChangeUDPListener(const isc::asiolink::IOAddress& ip_address,
     // pointer to our completion handler method, receiveCompletionHandler.
     RawBufferPtr buffer(new uint8_t[RECV_BUF_MAX]);
     UDPEndpointPtr data_source(new asiolink::UDPEndpoint());
-    recv_callback_.reset(new
-                         UDPCallback(buffer, RECV_BUF_MAX, data_source,
-                                     std::bind(&NameChangeUDPListener::
-                                     receiveCompletionHandler, this, ph::_1, ph::_2)));
+    recv_callback_.reset(new UDPCallback(buffer, RECV_BUF_MAX, data_source,
+        std::bind(&NameChangeUDPListener::receiveCompletionHandler,
+                 this, ph::_1, ph::_2)));
 }
 
 NameChangeUDPListener::~NameChangeUDPListener() {
@@ -210,9 +209,8 @@ NameChangeUDPSender(const isc::asiolink::IOAddress& ip_address,
     RawBufferPtr buffer(new uint8_t[SEND_BUF_MAX]);
     UDPEndpointPtr data_source(new asiolink::UDPEndpoint());
     send_callback_.reset(new UDPCallback(buffer, SEND_BUF_MAX, data_source,
-                                         std::bind(&NameChangeUDPSender::
-                                         sendCompletionHandler, this,
-                                         ph::_1, ph::_2)));
+        std::bind(&NameChangeUDPSender::sendCompletionHandler,
+                  this, ph::_1, ph::_2)));
 }
 
 NameChangeUDPSender::~NameChangeUDPSender() {

diff --git a/src/lib/dhcpsrv/tests/d2_udp_unittest.cc b/src/lib/dhcpsrv/tests/d2_udp_unittest.cc
index 66471b9b3e681e61a9da8beb12efacb10d182849..fef107b2cad8d849dfe5ff5cdb7d3511cf377aba 100644 (file)
--- a/src/lib/dhcpsrv/tests/d2_udp_unittest.cc
+++ b/src/lib/dhcpsrv/tests/d2_udp_unittest.cc
@@ -165,7 +165,7 @@ public:
 
     /// @brief Returns D2ClientErroHandler bound to this::error_handler_.
     D2ClientErrorHandler getErrorHandler() {
-      return (std::bind(&D2ClientMgrTest::error_handler, this, ph::_1, ph::_2));
+        return (std::bind(&D2ClientMgrTest::error_handler, this, ph::_1, ph::_2));
     }
 
     /// @brief Constructs a NameChangeRequest message from a fixed JSON string.

diff --git a/src/lib/dns/master_loader_callbacks.h b/src/lib/dns/master_loader_callbacks.h
index b5637414e5d03967fc27a894e0506080a4dc5760..a73168569f2e7516bc94b753e575276b26452de1 100644 (file)
--- a/src/lib/dns/master_loader_callbacks.h
+++ b/src/lib/dns/master_loader_callbacks.h
@@ -74,7 +74,7 @@ public:
         error_(error),
         warning_(warning)
     {
-        if (!error_ || !warning) {
+        if (!error_ || !warning_) {
             isc_throw(isc::InvalidParameter,
                       "Empty function passed as callback");
         }