mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 14:35:29 +00:00
Code Issues Releases Wiki Activity

spelling

Browse Source
This commit is contained in:
Francis Dupont
2015-01-22 11:28:13 +01:00
parent 28a5c5a137
commit 2409c6c40b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/dhcp4/json_config_parser.cc
View File

@@ -111,7 +111,7 @@ public:
/// @brief Constructor /// @brief Constructor
/// ///
/// @param ignored first parameter /// @param ignored first parameter
/// stores global scope parameters, options, option defintions. /// stores global scope parameters, options, option definitions.
Subnet4ConfigParser(const std::string&) Subnet4ConfigParser(const std::string&)
:SubnetConfigParser("", globalContext(), IOAddress("0.0.0.0")) { :SubnetConfigParser("", globalContext(), IOAddress("0.0.0.0")) {
} }
@@ -455,7 +455,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
// Answer will hold the result. // Answer will hold the result.
ConstElementPtr answer; ConstElementPtr answer;
// Rollback informs whether error occured and original data // Rollback informs whether error occurred and original data
// have to be restored to global storages. // have to be restored to global storages.
bool rollback = false; bool rollback = false;
// config_pair holds the details of the current parser when iterating over // config_pair holds the details of the current parser when iterating over
@@ -520,7 +520,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
.arg(config_pair.first).arg(ex.what()); .arg(config_pair.first).arg(ex.what());
answer = isc::config::createAnswer(1, ex.what()); answer = isc::config::createAnswer(1, ex.what());
// An error occured, so make sure that we restore original data. // An error occurred, so make sure that we restore original data.
rollback = true; rollback = true;
} catch (...) { } catch (...) {
@@ -529,7 +529,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
answer = isc::config::createAnswer(1, "undefined configuration" answer = isc::config::createAnswer(1, "undefined configuration"
" processing error"); " processing error");
// An error occured, so make sure that we restore original data. // An error occurred, so make sure that we restore original data.
rollback = true; rollback = true;
} }