From: Josh Soref Date: Sun, 23 Jul 2017 19:19:44 +0000 (-0400) Subject: spelling: overridden X-Git-Tag: trac5124a_base~35^2~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=185a9147beba576310f238f2802184e3c0889aa1;p=thirdparty%2Fkea.git spelling: overridden --- diff --git a/src/bin/d2/tests/d2_update_message_unittests.cc b/src/bin/d2/tests/d2_update_message_unittests.cc index 180a87b3b2..a17211a931 100644 --- a/src/bin/d2/tests/d2_update_message_unittests.cc +++ b/src/bin/d2/tests/d2_update_message_unittests.cc @@ -112,7 +112,7 @@ TEST_F(D2UpdateMessageTest, setZone) { EXPECT_EQ(RRClass::ANY().getCode(), zone->getClass().getCode()); // Now, let's check that the existing Zone object can be - // overriden with a new one. + // overridden with a new one. msg.setZone(Name("foo.example.com"), RRClass::NONE()); zone = msg.getZone(); EXPECT_TRUE(zone); diff --git a/src/bin/dhcp6/tests/host_unittest.cc b/src/bin/dhcp6/tests/host_unittest.cc index d03fd7b731..461e281bf5 100644 --- a/src/bin/dhcp6/tests/host_unittest.cc +++ b/src/bin/dhcp6/tests/host_unittest.cc @@ -495,7 +495,7 @@ public: /// @brief Verifies that host specific options override subnet specific /// options. /// - /// Overriden options are requested with Option Request option. + /// Overridden options are requested with Option Request option. /// /// @param msg_type DHCPv6 message type to be sent to the server. If the /// message type is Renew or Rebind, the 4-way exchange is made prior to diff --git a/src/bin/perfdhcp/pkt_transform.h b/src/bin/perfdhcp/pkt_transform.h index 6ae26cd960..c1f38c5e2c 100644 --- a/src/bin/perfdhcp/pkt_transform.h +++ b/src/bin/perfdhcp/pkt_transform.h @@ -36,7 +36,7 @@ public: /// The method copies the input buffer and options contents /// to the output buffer. The input buffer must contain whole /// initial packet data. Parts of this data will be - /// overriden by options data specified in an options + /// overridden by options data specified in an options /// collection. Such options must have their offsets within /// a packet specified (see \ref LocalizedOption to find out /// how to specify options offset). diff --git a/src/lib/dhcp/pkt_filter.h b/src/lib/dhcp/pkt_filter.h index e310500cd1..90a2259730 100644 --- a/src/lib/dhcp/pkt_filter.h +++ b/src/lib/dhcp/pkt_filter.h @@ -109,7 +109,7 @@ protected: /// /// This method provides a means to open a fallback socket and bind it /// to a given IPv4 address and UDP port. This function may be used by the - /// derived classes to create a fallback socket. It can be overriden + /// derived classes to create a fallback socket. It can be overridden /// in the derived classes if it happens to be insufficient on some /// environments. /// diff --git a/src/lib/dhcp/pkt_filter_bpf.cc b/src/lib/dhcp/pkt_filter_bpf.cc index 7425818db4..20d0098c68 100644 --- a/src/lib/dhcp/pkt_filter_bpf.cc +++ b/src/lib/dhcp/pkt_filter_bpf.cc @@ -137,7 +137,7 @@ struct bpf_insn ethernet_ip_udp_filter [] = { struct bpf_insn loopback_ip_udp_filter [] = { // Make sure this is an IP packet. The pseudo header comprises a 4-byte // long value identifying the address family, which should be set to - // AF_INET. The default value used here (0xFFFFFFFF) must be overriden + // AF_INET. The default value used here (0xFFFFFFFF) must be overridden // with htonl(AF_INET) from within the openSocket function. // #0 BPF_STMT(BPF_LD + BPF_W + BPF_ABS, 0), diff --git a/src/lib/dhcp/tests/option_custom_unittest.cc b/src/lib/dhcp/tests/option_custom_unittest.cc index 8ec6ac5c69..5a44bd908f 100644 --- a/src/lib/dhcp/tests/option_custom_unittest.cc +++ b/src/lib/dhcp/tests/option_custom_unittest.cc @@ -1357,7 +1357,7 @@ TEST_F(OptionCustomTest, setBinaryData) { } // Try to override the default binary buffer. ASSERT_NO_THROW(option->writeBinary(buf_in)); - // And check that it has been actually overriden. + // And check that it has been actually overridden. ASSERT_NO_THROW(buf = option->readBinary()); ASSERT_EQ(buf_in.size(), buf.size()); EXPECT_TRUE(std::equal(buf_in.begin(), buf_in.end(), buf.begin())); @@ -1365,7 +1365,7 @@ TEST_F(OptionCustomTest, setBinaryData) { // The purpose of this test is to verify that an option comprising // single boolean data field can be created and that its default -// value can be overriden by a new value. +// value can be overridden by a new value. TEST_F(OptionCustomTest, setBooleanData) { OptionDefinition opt_def("OPTION_FOO", 1000, "boolean"); @@ -1382,13 +1382,13 @@ TEST_F(OptionCustomTest, setBooleanData) { EXPECT_FALSE(value); // Check that we can override the default value. ASSERT_NO_THROW(option->writeBoolean(true)); - // Finally, check that it has been actually overriden. + // Finally, check that it has been actually overridden. ASSERT_NO_THROW(value = option->readBoolean()); EXPECT_TRUE(value); } /// The purpose of this test is to verify that the data field value -/// can be overriden by a new value. +/// can be overridden by a new value. TEST_F(OptionCustomTest, setUint32Data) { // Create a definition of an option that holds single // uint32 value. @@ -1418,7 +1418,7 @@ TEST_F(OptionCustomTest, setUint32Data) { // The purpose of this test is to verify that an option comprising // single IPv4 address can be created and that this address can -// be overriden by a new value. +// be overridden by a new value. TEST_F(OptionCustomTest, setIpv4AddressData) { OptionDefinition opt_def("OPTION_FOO", 232, "ipv4-address"); @@ -1442,7 +1442,7 @@ TEST_F(OptionCustomTest, setIpv4AddressData) { // The purpose of this test is to verify that an option comprising // single IPv6 address can be created and that this address can -// be overriden by a new value. +// be overridden by a new value. TEST_F(OptionCustomTest, setIpv6AddressData) { OptionDefinition opt_def("OPTION_FOO", 1000, "ipv6-address"); @@ -1465,7 +1465,7 @@ TEST_F(OptionCustomTest, setIpv6AddressData) { } // The purpose of this test is to verify that an option comprising -// a prefix can be created and that the prefix can be overriden by +// a prefix can be created and that the prefix can be overridden by // a new value. TEST_F(OptionCustomTest, setPrefixData) { OptionDefinition opt_def("option-foo", 1000, "ipv6-prefix"); @@ -1494,7 +1494,7 @@ TEST_F(OptionCustomTest, setPrefixData) { } // The purpose of this test is to verify that an option comprising -// a single PSID can be created and that the PSID can be overriden +// a single PSID can be created and that the PSID can be overridden // by a new value. TEST_F(OptionCustomTest, setPsidData) { OptionDefinition opt_def("option-foo", 1000, "psid"); @@ -1551,7 +1551,7 @@ TEST_F(OptionCustomTest, setStringData) { /// The purpose of this test is to verify that an option comprising /// a default FQDN value can be created and that this value can be -/// overriden after the option has been created. +/// overridden after the option has been created. TEST_F(OptionCustomTest, setFqdnData) { OptionDefinition opt_def("OPTION_FOO", 1000, "fqdn"); @@ -1568,7 +1568,7 @@ TEST_F(OptionCustomTest, setFqdnData) { EXPECT_EQ(".", fqdn); // Try override the default FQDN value. ASSERT_NO_THROW(option->writeFqdn("example.com")); - // Check that the value has been actually overriden. + // Check that the value has been actually overridden. ASSERT_NO_THROW(fqdn = option->readFqdn()); EXPECT_EQ("example.com.", fqdn); } diff --git a/src/lib/dhcp/tests/option_int_unittest.cc b/src/lib/dhcp/tests/option_int_unittest.cc index b9d1a4ae20..439c1fe09d 100644 --- a/src/lib/dhcp/tests/option_int_unittest.cc +++ b/src/lib/dhcp/tests/option_int_unittest.cc @@ -296,7 +296,7 @@ TEST_F(OptionIntTest, setValueUint8) { EXPECT_EQ(Option::V6, opt->getUniverse()); EXPECT_EQ(D6O_PREFERENCE, opt->getType()); - // Check if the value has been overriden. + // Check if the value has been overridden. EXPECT_EQ(111, opt->getValue()); } @@ -310,7 +310,7 @@ TEST_F(OptionIntTest, setValueInt8) { EXPECT_EQ(Option::V6, opt->getUniverse()); EXPECT_EQ(D6O_PREFERENCE, opt->getType()); - // Check if the value has been overriden. + // Check if the value has been overridden. EXPECT_EQ(-111, opt->getValue()); } @@ -325,7 +325,7 @@ TEST_F(OptionIntTest, setValueUint16) { EXPECT_EQ(Option::V6, opt->getUniverse()); EXPECT_EQ(D6O_ELAPSED_TIME, opt->getType()); - // Check if the value has been overriden. + // Check if the value has been overridden. EXPECT_EQ(0x0102, opt->getValue()); } @@ -339,7 +339,7 @@ TEST_F(OptionIntTest, setValueInt16) { EXPECT_EQ(Option::V6, opt->getUniverse()); EXPECT_EQ(D6O_ELAPSED_TIME, opt->getType()); - // Check if the value has been overriden. + // Check if the value has been overridden. EXPECT_EQ(-20100, opt->getValue()); } @@ -353,7 +353,7 @@ TEST_F(OptionIntTest, setValueUint32) { EXPECT_EQ(Option::V6, opt->getUniverse()); EXPECT_EQ(D6O_CLT_TIME, opt->getType()); - // Check if the value has been overriden. + // Check if the value has been overridden. EXPECT_EQ(0x01020304, opt->getValue()); } @@ -367,7 +367,7 @@ TEST_F(OptionIntTest, setValueInt32) { EXPECT_EQ(Option::V6, opt->getUniverse()); EXPECT_EQ(D6O_CLT_TIME, opt->getType()); - // Check if the value has been overriden. + // Check if the value has been overridden. EXPECT_EQ(-125000, opt->getValue()); } diff --git a/src/lib/dhcp/tests/option_space_unittest.cc b/src/lib/dhcp/tests/option_space_unittest.cc index 5ec11ddf5a..77b25aad5f 100644 --- a/src/lib/dhcp/tests/option_space_unittest.cc +++ b/src/lib/dhcp/tests/option_space_unittest.cc @@ -35,7 +35,7 @@ TEST(OptionSpaceTest, constructor) { } // The purpose of this test is to verify that the vendor-space flag -// can be overriden. +// can be overridden. TEST(OptionSpaceTest, setVendorSpace) { OptionSpace space("isc", true); EXPECT_EQ("isc", space.getName()); diff --git a/src/lib/dhcp/tests/option_string_unittest.cc b/src/lib/dhcp/tests/option_string_unittest.cc index 136f032376..f8fb02aac0 100644 --- a/src/lib/dhcp/tests/option_string_unittest.cc +++ b/src/lib/dhcp/tests/option_string_unittest.cc @@ -105,7 +105,7 @@ TEST_F(OptionStringTest, constructorFromBuffer) { EXPECT_EQ(optv6_value, optv6->getValue()); } -// This test verifies that the current option value can be overriden +// This test verifies that the current option value can be overridden // with new value, using setValue method. TEST_F(OptionStringTest, setValue) { // Create an instance of the option and set some initial value. diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc index 8c6efec17b..c7592967de 100644 --- a/src/lib/dhcpsrv/mysql_host_data_source.cc +++ b/src/lib/dhcpsrv/mysql_host_data_source.cc @@ -575,7 +575,7 @@ public: /// adding duplicated hosts to the collection, assuming that processed /// rows are primarily ordered by host id column. /// - /// This method must be overriden in the derived classes to also + /// This method must be overridden in the derived classes to also /// retrieve IPv6 reservations and DHCP options associated with a host. /// /// @param [out] hosts Collection of hosts to which a new host created diff --git a/src/lib/dhcpsrv/parsers/host_reservation_parser.h b/src/lib/dhcpsrv/parsers/host_reservation_parser.h index 68de6eeb3d..b6542c4af7 100644 --- a/src/lib/dhcpsrv/parsers/host_reservation_parser.h +++ b/src/lib/dhcpsrv/parsers/host_reservation_parser.h @@ -38,7 +38,7 @@ protected: /// @brief Parses a single entry for host reservation. /// - /// This method is called by @ref parse and it can be overriden in the + /// This method is called by @ref parse and it can be overridden in the /// derived classes to provide class specific parsing logic. /// /// @param subnet_id Identifier of the subnet that the host is @@ -158,7 +158,7 @@ protected: /// @brief Parses a list of host identifiers. /// - /// This method is called by @ref parse and it can be overriden in the + /// This method is called by @ref parse and it can be overridden in the /// derived classes to provide class specific parsing logic. /// /// @param ids_list Data element pointing to an ordered list of host diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc index ac41591d84..ef0703f5bc 100644 --- a/src/lib/dhcpsrv/pgsql_host_data_source.cc +++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc @@ -231,7 +231,7 @@ public: /// adding duplicated hosts to the collection, assuming that processed /// rows are primarily ordered by host id column. /// - /// This method must be overriden in the derived classes to also + /// This method must be overridden in the derived classes to also /// retrieve IPv6 reservations and DHCP options associated with a host. /// /// @param [out] hosts Collection of hosts to which a new host created diff --git a/src/lib/dhcpsrv/tests/cfg_expiration_unittest.cc b/src/lib/dhcpsrv/tests/cfg_expiration_unittest.cc index c3318796ba..53468cd99a 100644 --- a/src/lib/dhcpsrv/tests/cfg_expiration_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfg_expiration_unittest.cc @@ -270,7 +270,7 @@ public: /// @brief Structure holding values of parameters with which the /// @c reclaimExpiredLeases was called. /// - /// These values are overriden on subsequent calls to this method. + /// These values are overridden on subsequent calls to this method. RecordedParams reclaim_params_; /// @brief Value of the parameter with which the @c deleteReclaimedLeases diff --git a/src/lib/testutils/dhcp_test_lib.sh.in b/src/lib/testutils/dhcp_test_lib.sh.in index 3bcb4f2c25..bdb49494f9 100644 --- a/src/lib/testutils/dhcp_test_lib.sh.in +++ b/src/lib/testutils/dhcp_test_lib.sh.in @@ -163,7 +163,7 @@ set_logger() { } # PID file path is by default /var/kea, but can be -# overriden by the environmental variable. +# overridden by the environmental variable. PID_FILE_PATH=@localstatedir@/@PACKAGE@/ if [ ! -z ${KEA_PIDFILE_DIR} ]; then PID_FILE_PATH="${KEA_PIDFILE_DIR}"