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");
}
}
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");
}
}
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");
}
}
: 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");
}
}
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");
}
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");
}
}
: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");
}
}
// 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");
}
}
typedef std::vector<PoolPtr> PoolStorage;
typedef boost::shared_ptr<PoolStorage> 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
/// 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);
/// @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.
/// @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();
/// (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_;
};