From db2e3444d5b366e9d02859e7d68ee18c89022d1b Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Fri, 2 Mar 2018 10:03:47 +0100 Subject: [PATCH] [5522] Removed whitespace errors in a couple of files. --- src/lib/dhcp/libdhcp++.cc | 2 +- .../tests/generic_host_data_source_unittest.cc | 12 ++++++------ src/share/database/scripts/pgsql/dhcpdb_create.pgsql | 2 +- .../database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc index da85930362..b483bdacfe 100644 --- a/src/lib/dhcp/libdhcp++.cc +++ b/src/lib/dhcp/libdhcp++.cc @@ -685,7 +685,7 @@ size_t LibDHCP::unpackVendorOptions4(const uint32_t vendor_id, const OptionBuffe size_t offset = 0; // Get the list of standard option definitions. - const OptionDefContainerPtr& option_defs = LibDHCP::getVendorOption4Defs(vendor_id); + const OptionDefContainerPtr& option_defs = LibDHCP::1getVendorOption4Defs(vendor_id); // Get the search index #1. It allows to search for option definitions // using option code. const OptionDefContainerTypeIndex* idx = NULL; diff --git a/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc index 02a8e8512e..c84633895a 100644 --- a/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc @@ -257,13 +257,13 @@ GenericHostDataSourceTest::testBasic4(const Host::IdentifierType& id) { HostDataSourceUtils::compareHosts(host, from_hds); } -void +void GenericHostDataSourceTest::testMaxSubnetId4() { std::vector ident; ident = HostDataSourceUtils::generateIdentifier(); SubnetID subnet_id4 = numeric_limits::max(); - HostPtr host(new Host(&ident[0], ident.size(), Host::IDENT_DUID, + HostPtr host(new Host(&ident[0], ident.size(), Host::IDENT_DUID, subnet_id4, 0, IOAddress("0.0.0.0"))); ASSERT_NO_THROW(addTestOptions(host, true, DHCP4_ONLY)); @@ -278,7 +278,7 @@ GenericHostDataSourceTest::testMaxSubnetId4() { ASSERT_NO_FATAL_FAILURE(HostDataSourceUtils::compareHosts(host, host_by_id)); // Now try to delete it: del4(subnet4-id, identifier-type, identifier) - EXPECT_TRUE(hdsptr_->del4(subnet_id4, Host::IDENT_DUID, &ident[0], + EXPECT_TRUE(hdsptr_->del4(subnet_id4, Host::IDENT_DUID, &ident[0], ident.size())); host_by_id = hdsptr_->get4(subnet_id4, host->getIdentifierType(), @@ -293,7 +293,7 @@ void GenericHostDataSourceTest::testMaxSubnetId6() { ident = HostDataSourceUtils::generateIdentifier(); SubnetID subnet_id6 = numeric_limits::max(); - HostPtr host(new Host(&ident[0], ident.size(), Host::IDENT_DUID, + HostPtr host(new Host(&ident[0], ident.size(), Host::IDENT_DUID, 0, subnet_id6, IOAddress("0.0.0.0"))); ASSERT_NO_THROW(addTestOptions(host, true, DHCP6_ONLY)); @@ -308,7 +308,7 @@ void GenericHostDataSourceTest::testMaxSubnetId6() { ASSERT_NO_FATAL_FAILURE(HostDataSourceUtils::compareHosts(host, host_by_id)); // Now try to delete it: del6(subnet6-id, identifier-type, identifier) - EXPECT_TRUE(hdsptr_->del6(subnet_id6, Host::IDENT_DUID, &ident[0], + EXPECT_TRUE(hdsptr_->del6(subnet_id6, Host::IDENT_DUID, &ident[0], ident.size())); host_by_id = hdsptr_->get4(subnet_id6, host->getIdentifierType(), @@ -540,7 +540,7 @@ GenericHostDataSourceTest::testUserContext(ConstElementPtr user_context) { subnet = host->getIPv6SubnetID(); ASSERT_NO_THROW(hdsptr_->add(host)); - + from_hds = hdsptr_->get6(subnet, Host::IDENT_HWADDR, &host->getIdentifier()[0], host->getIdentifier().size()); diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql index d14e3753e8..661388da5d 100644 --- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql +++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql @@ -536,7 +536,7 @@ UPDATE schema_version -- Upgrade to schema 3.3 begins here: --- Change subnet ID columns type to BIGINT to match lease4/6 tables +-- Change subnet ID columns type to BIGINT to match lease4/6 tables ALTER TABLE hosts ALTER COLUMN dhcp4_subnet_id TYPE BIGINT; ALTER TABLE hosts ALTER COLUMN dhcp6_subnet_id TYPE BIGINT; diff --git a/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in b/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in index b8c7248016..76f4683ea8 100644 --- a/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in +++ b/src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh.in @@ -19,7 +19,7 @@ psql "$@" >/dev/null <