From 9f47b6511d05cd8f7637e40fed1346e972aad83b Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Tue, 22 Mar 2016 17:31:30 +0100 Subject: [PATCH] [4326] untabified --- src/bin/admin/kea-admin.xml | 2 +- src/bin/keactrl/keactrl.xml | 2 +- src/bin/keactrl/tests/keactrl_tests.sh.in | 2 +- src/bin/perfdhcp/perfdhcp.xml | 2 +- src/bin/sockcreator/kea-sockcreator.xml | 5 +---- src/lib/asiolink/tests/tcp_socket_unittest.cc | 10 ++++----- src/lib/config/tests/testdata/data41_2.data | 22 +++++++++---------- src/lib/dhcpsrv/mysql_host_data_source.cc | 20 ++++++++--------- src/lib/dhcpsrv/mysql_host_data_source.h | 12 +++++----- src/lib/dns/opcode.cc | 2 +- src/lib/eval/token.cc | 12 +++++----- .../util/tests/boost_time_utils_unittest.cc | 2 +- src/lib/util/threads/thread.cc | 2 +- 13 files changed, 46 insertions(+), 49 deletions(-) diff --git a/src/bin/admin/kea-admin.xml b/src/bin/admin/kea-admin.xml index 0fdd5a3e32..a4bed13916 100644 --- a/src/bin/admin/kea-admin.xml +++ b/src/bin/admin/kea-admin.xml @@ -1,6 +1,6 @@ ]> + []> - - - diff --git a/src/lib/asiolink/tests/tcp_socket_unittest.cc b/src/lib/asiolink/tests/tcp_socket_unittest.cc index e79cef3e09..a6d78a1e3e 100644 --- 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 4e9767f6d9..c64e931dec 100644 --- 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 af52700ee2..17518df8c4 100644 --- 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 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 4e630bbf6b..890ae72fa0 100644 --- 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 d27930e77a..4a71fa8185 100644 --- 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(code)) { if (code > MAX_OPCODE) { isc_throw(OutOfRange, "DNS Opcode is too large to construct: " - << static_cast(code)); + << static_cast(code)); } } diff --git a/src/lib/eval/token.cc b/src/lib/eval/token.cc index dd23dbaa12..041b30feb9 100644 --- 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 b5290d9191..907de333eb 100644 --- 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 a4501c79f1..2154af5539 100644 --- 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.