From: Stephen Morris Date: Fri, 1 Aug 2014 12:04:04 +0000 (+0100) Subject: [3464] Correct some typos during review X-Git-Tag: trac3482_base~53^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eef93810fd72b2dd426f7905f3705bef72da0063;p=thirdparty%2Fkea.git [3464] Correct some typos during review --- diff --git a/src/lib/dhcpsrv/dhcp_parsers.cc b/src/lib/dhcpsrv/dhcp_parsers.cc index 0a48e1aeb4..38dc96002b 100644 --- a/src/lib/dhcpsrv/dhcp_parsers.cc +++ b/src/lib/dhcpsrv/dhcp_parsers.cc @@ -335,12 +335,12 @@ OptionDataParser::OptionDataParser(const std::string&, OptionStoragePtr options, options_(options), option_descriptor_(false), global_context_(global_context) { if (!options_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "options storage may not be NULL"); } if (!global_context_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "context may may not be NULL"); } } @@ -612,17 +612,17 @@ OptionDataListParser::OptionDataListParser(const std::string&, global_context_(global_context), optionDataParserFactory_(optionDataParserFactory) { if (!options_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "options storage may not be NULL"); } if (!options_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "context may not be NULL"); } if (!optionDataParserFactory_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "option data parser factory may not be NULL"); } } @@ -665,7 +665,7 @@ OptionDefParser::OptionDefParser(const std::string&, uint32_values_(new Uint32Storage()), global_context_(global_context) { if (!storage_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "options storage may not be NULL"); } } @@ -823,7 +823,7 @@ OptionDefListParser::OptionDefListParser(const std::string&, : storage_(global_context->option_defs_), global_context_(global_context) { if (!storage_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "storage may not be NULL"); } } @@ -888,7 +888,7 @@ RelayInfoParser::RelayInfoParser(const std::string&, family == Option::V4 ? "0.0.0.0" : "::")), string_values_(new StringStorage()), family_(family) { if (!relay_info) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "relay-info storage may not be NULL"); } @@ -947,7 +947,7 @@ RelayInfoParser::commit() { PoolsListParser::PoolsListParser(const std::string&, PoolStoragePtr pools) :pools_(pools), local_pools_(new PoolStorage()) { if (!pools_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "storage may not be NULL"); } } @@ -982,7 +982,7 @@ PoolParser::PoolParser(const std::string&, PoolStoragePtr pools) :pools_(pools) { if (!pools_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "storage may not be NULL"); } } @@ -1078,7 +1078,7 @@ SubnetConfigParser::SubnetConfigParser(const std::string&, // The first parameter should always be "subnet", but we don't check // against that here in case some wants to reuse this parser somewhere. if (!global_context_) { - isc_throw(isc::dhcp::DhcpConfigError, "parser logic error:" + isc_throw(isc::dhcp::DhcpConfigError, "parser logic error: " << "context storage may not be NULL"); } } diff --git a/src/lib/dhcpsrv/dhcp_parsers.h b/src/lib/dhcpsrv/dhcp_parsers.h index 55bf33d220..453a589b44 100644 --- a/src/lib/dhcpsrv/dhcp_parsers.h +++ b/src/lib/dhcpsrv/dhcp_parsers.h @@ -790,7 +790,7 @@ public: typedef std::vector PoolStorage; typedef boost::shared_ptr PoolStoragePtr; -/// @brief parser for a signle pool definition +/// @brief parser for a single pool definition /// /// This abstract parser handles pool definitions, i.e. a list of entries of one /// of two syntaxes: min-max and prefix/len. Pool objects are created @@ -814,7 +814,7 @@ public: /// This method parses the actual list of interfaces. /// No validation is done at this stage, everything is interpreted as /// interface name. - /// @param pool_structure a signle entry on a list of pools + /// @param pool_structure a single entry on a list of pools /// @throw isc::dhcp::DhcpConfigError when pool parsing fails virtual void build(isc::data::ConstElementPtr pool_structure); @@ -866,7 +866,7 @@ public: /// @brief constructor. /// /// @param dummy first argument is ignored, all Parser constructors - /// accept string as first argument. + /// accept a string as the first argument. /// @param pools is the storage in which to store the parsed pool /// upon "commit". /// @throw isc::dhcp::DhcpConfigError if storage is null. @@ -881,7 +881,7 @@ public: /// @throw isc::dhcp::DhcpConfigError when pool parsing fails virtual void build(isc::data::ConstElementPtr pools_list); - /// @brief Stores the parsed values in a storage provided + /// @brief Stores the parsed values in storage provided /// by an upper level parser. virtual void commit(); @@ -899,8 +899,8 @@ protected: /// (an upper level parser). PoolStoragePtr pools_; - /// A temporary storage for pools configuration. It is a - /// storage where pools are stored by build function. + /// A temporary storage for pools configuration. It is the + /// storage where pools are stored by the build function. PoolStoragePtr local_pools_; };