[5213] indent and untabily

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
index f318ab64a1f642f6955ea5b6a34238da05b5c8bb..5971134f2146556bfdfa6aa0ff44744c7afa3830 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc
@@ -21,6 +21,7 @@
 #include <signal.h>
 
 using namespace isc::data;
+using namespace isc::dhcp;
 using namespace isc::hooks;
 using namespace isc::config;
 using namespace isc::stats;
@@ -40,9 +41,11 @@ namespace {
 void signalHandler(int signo) {
     // SIGHUP signals a request to reconfigure the server.
     if (signo == SIGHUP) {
-        isc::dhcp::ControlledDhcpv4Srv::processCommand("config-reload", ConstElementPtr());
+        ControlledDhcpv4Srv::processCommand("config-reload",
+                                            ConstElementPtr());
     } else if ((signo == SIGTERM) || (signo == SIGINT)) {
-        isc::dhcp::ControlledDhcpv4Srv::processCommand("shutdown", ConstElementPtr());
+        ControlledDhcpv4Srv::processCommand("shutdown",
+                                            ConstElementPtr());
     }
 }
 

diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
index 34ab358d4428da2af3700d64e7a1bb4592c71365..49a912ae78ba767bd992e2372ef0865d4e3ade4d 100644 (file)
--- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
@@ -926,8 +926,8 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configTest) {
 
     // Verify the configuration was successful.
     EXPECT_EQ("{ \"result\": 0, \"text\": \"Configuration seems sane. "
-             "Control-socket, hook-libraries, and D2 configuration were "
-             "sanity checked, but not applied.\" }",
+              "Control-socket, hook-libraries, and D2 configuration were "
+              "sanity checked, but not applied.\" }",
               response);
 
     // Check that the config was not applied

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index c33aeb2e906842759d5711adb65997b4f09ebc4e..697eff51db8c29f5cefa653d9165e58a26e7dd52 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -22,6 +22,7 @@
 #include <signal.h>
 
 using namespace isc::config;
+using namespace isc::dhcp;
 using namespace isc::data;
 using namespace isc::hooks;
 using namespace isc::stats;
@@ -44,11 +45,11 @@ static const char* SERVER_DUID_FILE = "kea-dhcp6-serverid";
 void signalHandler(int signo) {
     // SIGHUP signals a request to reconfigure the server.
     if (signo == SIGHUP) {
-        isc::dhcp::ControlledDhcpv6Srv::processCommand("config-reload",
-                                                       ConstElementPtr());
+        ControlledDhcpv6Srv::processCommand("config-reload",
+                                            ConstElementPtr());
     } else if ((signo == SIGTERM) || (signo == SIGINT)) {
-        isc::dhcp::ControlledDhcpv6Srv::processCommand("shutdown",
-                                                       ConstElementPtr());
+        ControlledDhcpv6Srv::processCommand("shutdown",
+                                            ConstElementPtr());
     }
 }
 

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index 27b95e42d95d185af530bc78c55e3aa40fb32b32..ceebdab9e354547fcf546f02ce644ffb17b4878f 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -650,8 +650,8 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configTest) {
 
     // Verify the configuration was successful.
     EXPECT_EQ("{ \"result\": 0, \"text\": \"Configuration seems sane. "
-             "Control-socket, hook-libraries, and D2 configuration were "
-             "sanity checked, but not applied.\" }",
+              "Control-socket, hook-libraries, and D2 configuration were "
+              "sanity checked, but not applied.\" }",
               response);
 
     // Check that the config was not applied.