[4326] untabified

diff --git a/src/bin/admin/kea-admin.xml b/src/bin/admin/kea-admin.xml
index 0fdd5a3e321a68f2540249f7a64ee6b0c56b5bdb..a4bed13916608caf7722dafe346d01875656724d 100644 (file)
--- a/src/bin/admin/kea-admin.xml
+++ b/src/bin/admin/kea-admin.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-              [<!ENTITY mdash "&#8212;">]>
+               [<!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
  -

diff --git a/src/bin/keactrl/keactrl.xml b/src/bin/keactrl/keactrl.xml
index edf3ad0819da55a06410b944c4cfb2f6386a9146..d0633d7e72307c37ef3a2f6e989ebc535b399402 100644 (file)
--- a/src/bin/keactrl/keactrl.xml
+++ b/src/bin/keactrl/keactrl.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-              [<!ENTITY mdash "&#8212;">]>
+               [<!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
  -

diff --git a/src/bin/keactrl/tests/keactrl_tests.sh.in b/src/bin/keactrl/tests/keactrl_tests.sh.in
index bbbf5c36d5c39bccb7aa4f82c31788a871fd6158..ca7444ed6056a488867e51840d85e75bea49101c 100644 (file)
--- a/src/bin/keactrl/tests/keactrl_tests.sh.in
+++ b/src/bin/keactrl/tests/keactrl_tests.sh.in
@@ -958,7 +958,7 @@ status_no_config_test() {
     assert_string_contains "DHCP DDNS: inactive" "${output}" \
         "Expected keactrl status command return %s"
     assert_string_contains "Configuration file for Kea does not exist" \
-       "${output}" "Expected keactrl status command return %s"
+        "${output}" "Expected keactrl status command return %s"
 
     test_finish 0
 }

diff --git a/src/bin/perfdhcp/perfdhcp.xml b/src/bin/perfdhcp/perfdhcp.xml
index 4ceb4f7cfcaa32d72ebadf619adcd604d0dbf945..cdc3a724ddcfcfd62632733e4118130d15b042d7 100644 (file)
--- a/src/bin/perfdhcp/perfdhcp.xml
+++ b/src/bin/perfdhcp/perfdhcp.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-              [<!ENTITY mdash "&#8212;">]>
+               [<!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
  -

diff --git a/src/bin/sockcreator/kea-sockcreator.xml b/src/bin/sockcreator/kea-sockcreator.xml
index 00463b2ae9fe4f9a6c5367457d1ecfb570590ad5..c47fe9d7a1c4deeeb728a26855f6c892f3682dea 100644 (file)
--- a/src/bin/sockcreator/kea-sockcreator.xml
+++ b/src/bin/sockcreator/kea-sockcreator.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-              [<!ENTITY mdash "&#8212;">]>
+               [<!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
  -
@@ -81,6 +81,3 @@
  - mode: sgml
  - End:
 -->
-
-
-

diff --git a/src/lib/asiolink/tests/tcp_socket_unittest.cc b/src/lib/asiolink/tests/tcp_socket_unittest.cc
index e79cef3e09641ad82b968aec7c8c9d8ecae7071a..a6d78a1e3e98a36ad438b98b3e96d1e9eb1fdf97 100644 (file)
--- a/src/lib/asiolink/tests/tcp_socket_unittest.cc
+++ b/src/lib/asiolink/tests/tcp_socket_unittest.cc
@@ -455,13 +455,13 @@ TEST(TCPSocket, sequenceTest) {
             }
         }
 
-       // Has the client run?
+        // Has the client run?
         if (!client_complete) {
 
-           if (client_cb.called() != client_cb.queued()) {
-               // No. Run the service another time.
-               continue;
-           }
+            if (client_cb.called() != client_cb.queued()) {
+                // No. Run the service another time.
+                continue;
+            }
 
             // Client callback must have run.  Check that it ran OK.
             EXPECT_EQ(TCPCallback::READ, client_cb.called());

diff --git a/src/lib/config/tests/testdata/data41_2.data b/src/lib/config/tests/testdata/data41_2.data
index 4e9767f6d9f4173ae8e606301d4aef345925c91c..c64e931decaf7a9207c73d5ee32f4f00c4ac93e0 100644 (file)
--- a/src/lib/config/tests/testdata/data41_2.data
+++ b/src/lib/config/tests/testdata/data41_2.data
@@ -1,16 +1,16 @@
 {
     "zones": [
-       {
-           "example.org": {
-               "queries.tcp": 100,
-               "queries.udp": 200
-           }
-       },
-       {
-           "example.net": {
-               "queries.tcp": 300,
-               "queries.udp": 400
-           }
+        {
+            "example.org": {
+                "queries.tcp": 100,
+                "queries.udp": 200
+            }
+        },
+        {
+            "example.net": {
+                "queries.tcp": 300,
+                "queries.udp": 400
+            }
         }
     ]
 }

diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc
index af52700ee25620a79583dbbcd9bb0491428149fb..17518df8c41a0d20ba7b791b0c23badc79a7e28e 100644 (file)
--- a/src/lib/dhcpsrv/mysql_host_data_source.cc
+++ b/src/lib/dhcpsrv/mysql_host_data_source.cc
@@ -503,18 +503,18 @@ public:
     }
 
 private:
-    uint32_t   host_id_;                       /// Host unique identifier
+    uint32_t    host_id_;                       /// Host unique identifier
     std::vector<uint8_t> dhcp_identifier_;      /// HW address (0) / DUID (1)
     uint8_t     dhcp_identifier_buffer_[DUID::MAX_DUID_LEN];
                                                 /// Buffer for dhcp identifier
     unsigned long dhcp_identifier_length_;      /// Length of dhcp identifier
-    uint8_t     dhcp_identifier_type_;         /// Type of dhcp_identifier
-    uint32_t    dhcp4_subnet_id_;              /// Subnet DHCPv4 identifier
-    uint32_t    dhcp6_subnet_id_;              /// Subnet DHCPv6 identifier
-    uint32_t    ipv4_address_;                 /// Reserved IPv4 address.
-    IPv6ResrvCollection ipv6_reservations_;    /// IPv6 reservations collection
+    uint8_t     dhcp_identifier_type_;          /// Type of dhcp_identifier
+    uint32_t    dhcp4_subnet_id_;               /// Subnet DHCPv4 identifier
+    uint32_t    dhcp6_subnet_id_;               /// Subnet DHCPv6 identifier
+    uint32_t    ipv4_address_;                  /// Reserved IPv4 address.
+    IPv6ResrvCollection ipv6_reservations_;     /// IPv6 reservations collection
     char        hostname_[HOSTNAME_MAX_LEN];    /// Name reserved for the host
-    unsigned long hostname_length_;            /// hostname length
+    unsigned long hostname_length_;             /// hostname length
     char        dhcp4_client_classes_[CLIENT_CLASSES_MAX_LEN];
                                                 /// DHCPv4 client classes
     unsigned long dhcp4_client_classes_length_; /// dhcp4_client_classes length
@@ -522,7 +522,7 @@ private:
                                                 /// DHCPv6 client classes
     unsigned long dhcp6_client_classes_length_; /// dhcp6_client_classes length
     HWAddrPtr   hw_address_;                    /// Pointer to hardware address
-    DuidPtr     duid_;                         /// Pointer to DUID
+    DuidPtr     duid_;                          /// Pointer to DUID
 
     // NULL flags for subnets id, ipv4 address, hostname and client classes
     my_bool     dhcp4_subnet_id_null_;
@@ -533,9 +533,9 @@ private:
     my_bool     dhcp6_client_classes_null_;
 
     MYSQL_BIND  bind_[HOST_COLUMNS];
-    std::string columns_[HOST_COLUMNS];        /// Column names
+    std::string columns_[HOST_COLUMNS]; /// Column names
     my_bool     error_[HOST_COLUMNS];   /// Error array
-    HostPtr     host_;                 // Pointer to Host object
+    HostPtr     host_;                  // Pointer to Host object
 };
 
 // MySqlHostDataSource Constructor and Destructor

diff --git a/src/lib/dhcpsrv/mysql_host_data_source.h b/src/lib/dhcpsrv/mysql_host_data_source.h
index 4e630bbf6bc40d5638be8068eae8edf362d72c33..890ae72fa00037321af889bca0edc0bb9c50dbd2 100644 (file)
--- a/src/lib/dhcpsrv/mysql_host_data_source.h
+++ b/src/lib/dhcpsrv/mysql_host_data_source.h
@@ -221,13 +221,13 @@ public:
     ///
     /// The contents of the enum are indexes into the list of SQL statements
     enum StatementIndex {
-        INSERT_HOST,           // Insert new host to collection
+        INSERT_HOST,            // Insert new host to collection
         GET_HOST_HWADDR_DUID,   // Gets hosts by DUID and/or HW address
-        GET_HOST_ADDR,         // Gets hosts by IPv4 address
-        GET_HOST_SUBID4_DHCPID,        // Gets host by IPv4 SubnetID, HW address/DUID
-        GET_HOST_SUBID6_DHCPID,        // Gets host by IPv6 SubnetID, HW address/DUID
+        GET_HOST_ADDR,          // Gets hosts by IPv4 address
+        GET_HOST_SUBID4_DHCPID, // Gets host by IPv4 SubnetID, HW address/DUID
+        GET_HOST_SUBID6_DHCPID, // Gets host by IPv6 SubnetID, HW address/DUID
         GET_HOST_SUBID_ADDR,    // Gets host by IPv4 SubnetID and IPv4 address
-        GET_HOST_PREFIX,       // Gets host by IPv6 prefix
+        GET_HOST_PREFIX,        // Gets host by IPv6 prefix
         GET_VERSION,            // Obtain version number
         NUM_STATEMENTS          // Number of statements
     };
@@ -236,7 +236,7 @@ private:
     /// @brief Add Host Code
     ///
     /// This method performs adding a host operation.
-    ///        It binds the contents of the host object to
+    /// It binds the contents of the host object to
     /// the prepared statement and adds it to the database.
     ///
     /// @param stindex Index of statemnent being executed

diff --git a/src/lib/dns/opcode.cc b/src/lib/dns/opcode.cc
index d27930e77a53454dd64543cbcbf824e4f164733a..4a71fa8185bef11d4277caf1b6317927051b02e7 100644 (file)
--- a/src/lib/dns/opcode.cc
+++ b/src/lib/dns/opcode.cc
@@ -43,7 +43,7 @@ Opcode::Opcode(const uint8_t code) : code_(static_cast<CodeValue>(code)) {
     if (code > MAX_OPCODE) {
         isc_throw(OutOfRange,
                   "DNS Opcode is too large to construct: "
-                 << static_cast<unsigned>(code));
+                  << static_cast<unsigned>(code));
     }
 }
 

diff --git a/src/lib/eval/token.cc b/src/lib/eval/token.cc
index dd23dbaa1270572d018b47cf0dd7a31415161bfc..041b30feb975e4169c3c80a9ba718a9dfe7e59ec 100644 (file)
--- a/src/lib/eval/token.cc
+++ b/src/lib/eval/token.cc
@@ -224,9 +224,9 @@ TokenNot::evaluate(const Pkt& /*pkt*/, ValueStack& values) {
     bool val = toBool(op);
 
     if (!val) {
-       values.push("true");
+        values.push("true");
     } else {
-       values.push("false");
+        values.push("false");
     }
 }
 
@@ -246,9 +246,9 @@ TokenAnd::evaluate(const Pkt& /*pkt*/, ValueStack& values) {
     bool val2 = toBool(op2);
 
     if (val1 && val2) {
-       values.push("true");
+        values.push("true");
     } else {
-       values.push("false");
+        values.push("false");
     }
 }
 
@@ -268,8 +268,8 @@ TokenOr::evaluate(const Pkt& /*pkt*/, ValueStack& values) {
     bool val2 = toBool(op2);
 
     if (val1 || val2) {
-       values.push("true");
+        values.push("true");
     } else {
-       values.push("false");
+        values.push("false");
     }
 }

diff --git a/src/lib/util/tests/boost_time_utils_unittest.cc b/src/lib/util/tests/boost_time_utils_unittest.cc
index b5290d9191d0c4144c4ca9c202ac30f85e0e469a..907de333eb49d233a4effe2a4668bc1edc0d43e9 100644 (file)
--- a/src/lib/util/tests/boost_time_utils_unittest.cc
+++ b/src/lib/util/tests/boost_time_utils_unittest.cc
@@ -31,7 +31,7 @@ TEST(BoostTimeUtilsTest, epoch) {
 // The 2015 Bastille day
 TEST(BoostTimeUtilsTest, bastilleDay) {
     time_duration tdbast =
-       hours(12) + minutes(13) + seconds(14) + milliseconds(500);
+        hours(12) + minutes(13) + seconds(14) + milliseconds(500);
     ptime pbast(date(2015, Jul, 14), tdbast);
     string sbast = ptimeToText(pbast);
     EXPECT_EQ("2015-07-14 12:13:14.500", sbast.substr(0, 23));

diff --git a/src/lib/util/threads/thread.cc b/src/lib/util/threads/thread.cc
index a4501c79f190a13cd0ba68572bb48c3c2830e261..2154af553937498910b07a875dd1136a5bcbdc2b 100644 (file)
--- a/src/lib/util/threads/thread.cc
+++ b/src/lib/util/threads/thread.cc
@@ -67,7 +67,7 @@ public:
         waiting_(2),
         main_(main),
         exception_(false),
-       tid_(0)
+        tid_(0)
     {}
     // Another of the waiting events is done. If there are no more, delete
     // impl.