From: Francis Dupont Date: Thu, 3 Aug 2017 12:22:11 +0000 (+0200) Subject: [5272] spelling X-Git-Tag: trac5124a_base~20^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15a1411f174c001d4435cbb13c96a4e1c5549e70;p=thirdparty%2Fkea.git [5272] spelling --- diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc index d9a033ca45..f4c9b1c222 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc @@ -87,14 +87,14 @@ public: } /// @brief specifies parameter types (true = query by address, false = - /// query by indetifier-type,identifier) + /// query by identifier-type,identifier) Type query_type; Lease::Type lease_type; uint32_t iaid; - /// @brief Default contstructor. + /// @brief Default constructor. Parameters() :addr("::"), query_type(TYPE_ADDR), lease_type(Lease::TYPE_NA), iaid(0) { } @@ -119,7 +119,7 @@ private: /// @throw Unexpected if CommandMgr is not available (should not happen) void registerCommands(); - /// @brief Dergisters commands: + /// @brief Deregisters commands: /// /// Deregisters: /// - lease4-add @@ -154,7 +154,7 @@ private: /// "valid-lft": 3600, /// "expire": 12345678, /// "subnet-id": 1, - /// "fdqn-fwd": true, + /// "fqdn-fwd": true, /// "fqdn-rev": true, /// "hostname": "myhost.example.org", /// "state": 0 @@ -384,7 +384,7 @@ LeaseCmdsImpl::getParameters(const ConstElementPtr& params) { // We support several sets of parameters for leaseX-get/lease-del: // lease-get(type, address) - // lease-get(type, subnet-id, interifier-type, identifier) + // lease-get(type, subnet-id, identifier-type, identifier) if (params->contains("type")) { string t = params->get("type")->stringValue(); diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.h b/src/hooks/dhcp/lease_cmds/lease_cmds.h index 48161e541b..c43ccb9b18 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds.h +++ b/src/hooks/dhcp/lease_cmds/lease_cmds.h @@ -18,13 +18,13 @@ class LeaseCmdsImpl; /// @brief A wrapper class that provides convenient initialization to the library. /// /// This is a wrapper class that simply registers extra commands when -/// instantiated and deregisters them when the instance is destryed. +/// instantiated and deregisters them when the instance is destroyed. /// /// For an actual implementation, see @ref LeaseCmdsImpl class in lease_cmds.cc file. class LeaseCmds { public: - /// @brief Initalizes additional host commands. + /// @brief Initializes additional host commands. /// /// First, it ensures that either alternate host data source or CfgHosts /// (configuration storage) are available. Then it checks that CommandMgr diff --git a/src/hooks/dhcp/lease_cmds/lease_parser.cc b/src/hooks/dhcp/lease_cmds/lease_parser.cc index 2506cddca1..52a1d5de45 100644 --- a/src/hooks/dhcp/lease_cmds/lease_parser.cc +++ b/src/hooks/dhcp/lease_cmds/lease_parser.cc @@ -83,7 +83,7 @@ Lease4Parser::parse(ConstSrvConfigPtr& cfg, /// timestamp is specified explicitly, we will use that. Note there are no /// checks whether this is in the past. There may be valid cases when user /// wants to insert expired leases, e.g. when migrating from one DHCP server - /// to another and wants to migrate the database as is, without disarding + /// to another and wants to migrate the database as is, without discarding /// any leases. time_t cltt; if (lease_info->contains("expire")) { @@ -210,7 +210,7 @@ Lease6Parser::parse(ConstSrvConfigPtr& cfg, /// no checks whether this is in the past. There may be valid cases when /// user wants to insert expired leases, e.g. when migrating from one /// DHCP server to another and wants to migrate the database as is, without - /// disarding any leases. + /// discarding any leases. time_t cltt; if (lease_info->contains("expire")) { int64_t tmp = getUint32(lease_info, "expire"); diff --git a/src/hooks/dhcp/lease_cmds/lease_parser.h b/src/hooks/dhcp/lease_cmds/lease_parser.h index cd0e9836db..f5d2dafbad 100644 --- a/src/hooks/dhcp/lease_cmds/lease_parser.h +++ b/src/hooks/dhcp/lease_cmds/lease_parser.h @@ -39,7 +39,7 @@ protected: /// "cltt": 12345678, /// "expire": 1499282530, /// "subnet-id": 1, -/// "fdqn-fwd": true, +/// "fqdn-fwd": true, /// "fqdn-rev": true, /// "hostname": "myhost.example.org", /// "state": 0 @@ -74,7 +74,7 @@ public: /// "valid-lft": 3600, /// "expire": 1499282530, /// "subnet-id": 1, -/// "fdqn-fwd": true, +/// "fqdn-fwd": true, /// "fqdn-rev": true, /// "hostname": "myhost.example.org", /// "state": 0 diff --git a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc index bc13ab67aa..b5b019a0f5 100644 --- a/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc +++ b/src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc @@ -46,7 +46,7 @@ public: libraries_.push_back(make_pair(lib, params)); } - /// @brief Load all specified libriaries. + /// @brief Load all specified libraries. /// /// The libraries are stored in libraries void loadLibs() { @@ -745,7 +745,7 @@ TEST_F(LeaseCmdsTest, Lease6AddBadParams) { exp_rsp = "The address 3000::3 does not belong to subnet 2001:db8::/48, subnet-id=66"; testCommand(txt, CONTROL_RESULT_ERROR, exp_rsp); - // v4? You're a time traveller from early 80s or what? + // v4? You're a time traveler from early 80s or what? txt = "{\n" " \"command\": \"lease6-add\",\n" diff --git a/src/lib/dhcpsrv/cfg_subnets4.h b/src/lib/dhcpsrv/cfg_subnets4.h index d37aa112af..26d2d1d8f3 100644 --- a/src/lib/dhcpsrv/cfg_subnets4.h +++ b/src/lib/dhcpsrv/cfg_subnets4.h @@ -99,7 +99,7 @@ public: /// @brief Returns subnet with specified subnet-id value /// - /// Warning: this method uses full scan. Its use is not recommeded for + /// Warning: this method uses full scan. Its use is not recommended for /// packet processing. /// /// @return Subnet (or NULL) diff --git a/src/lib/dhcpsrv/cfg_subnets6.h b/src/lib/dhcpsrv/cfg_subnets6.h index e5ed5adb06..082769ac9f 100644 --- a/src/lib/dhcpsrv/cfg_subnets6.h +++ b/src/lib/dhcpsrv/cfg_subnets6.h @@ -89,7 +89,7 @@ public: /// @brief Returns subnet with specified subnet-id value /// - /// Warning: this method uses full scan. Its use is not recommeded for + /// Warning: this method uses full scan. Its use is not recommended for /// packet processing. /// /// @return Subnet (or NULL)