Commit 73f6a7dc authored by Josh Soref's avatar Josh Soref
Browse files

spelling: return

parent 89083977
...@@ -392,7 +392,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}" ...@@ -392,7 +392,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n" printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n"
${keactrl} start -c ${KEACTRL_CFG_FILE} ${keactrl} start -c ${KEACTRL_CFG_FILE}
ret=${?} ret=${?}
assert_eq 0 ${ret} "Expected keactrl to retrun 0, returned value was ${ret}" assert_eq 0 ${ret} "Expected keactrl to return 0, returned value was ${ret}"
# Wait up to 20s for the DHCPv4 server to configure. # Wait up to 20s for the DHCPv4 server to configure.
wait_for_message 20 "DHCP4_CONFIG_COMPLETE" 1 wait_for_message 20 "DHCP4_CONFIG_COMPLETE" 1
...@@ -568,7 +568,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}" ...@@ -568,7 +568,7 @@ dhcp_ddns=no\nctrl_agent=no\nkea_verbose=no\n${keactrl_fixed_config}"
printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n" printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n"
${keactrl} start -c ${KEACTRL_CFG_FILE} ${keactrl} start -c ${KEACTRL_CFG_FILE}
ret=${?} ret=${?}
assert_eq 0 ${ret} "Expected keactrl to retrun 0, returned value was ${ret}" assert_eq 0 ${ret} "Expected keactrl to return 0, returned value was ${ret}"
# Wait up to 20s for the DHCPv6 server to configure. # Wait up to 20s for the DHCPv6 server to configure.
wait_for_message 20 "DHCP6_CONFIG_COMPLETE" 1 wait_for_message 20 "DHCP6_CONFIG_COMPLETE" 1
...@@ -731,7 +731,7 @@ dhcp_ddns=no\nctrl_agent=yes\nkea_verbose=yes\n${keactrl_fixed_config}" ...@@ -731,7 +731,7 @@ dhcp_ddns=no\nctrl_agent=yes\nkea_verbose=yes\n${keactrl_fixed_config}"
printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n" printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n"
${keactrl} start -c ${KEACTRL_CFG_FILE} ${keactrl} start -c ${KEACTRL_CFG_FILE}
ret=${?} ret=${?}
assert_eq 0 ${ret} "Expected keactrl to retrun 0, returned value was ${ret}" assert_eq 0 ${ret} "Expected keactrl to return 0, returned value was ${ret}"
# Wait up to 20s for the DHCPv4 server to configure. # Wait up to 20s for the DHCPv4 server to configure.
wait_for_message 20 "DHCP4_CONFIG_COMPLETE" 1 wait_for_message 20 "DHCP4_CONFIG_COMPLETE" 1
...@@ -783,7 +783,7 @@ dhcp_ddns=yes\nctrl_agent=yes\nkea_verbose=no\n${keactrl_fixed_config}" ...@@ -783,7 +783,7 @@ dhcp_ddns=yes\nctrl_agent=yes\nkea_verbose=no\n${keactrl_fixed_config}"
printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n" printf "Starting Kea: ${keactrl} start -c ${KEACTRL_CFG_FILE}\n"
${keactrl} start -c ${KEACTRL_CFG_FILE} ${keactrl} start -c ${KEACTRL_CFG_FILE}
ret=${?} ret=${?}
assert_eq 0 ${ret} "Expected keactrl to retrun 0, returned value was ${ret}" assert_eq 0 ${ret} "Expected keactrl to return 0, returned value was ${ret}"
# Wait up to 20s for the DHCPv6 server to configure. # Wait up to 20s for the DHCPv6 server to configure.
wait_for_message 20 "DHCP6_CONFIG_COMPLETE" 1 wait_for_message 20 "DHCP6_CONFIG_COMPLETE" 1
......
...@@ -829,7 +829,7 @@ OptionDefinition::factorySpecialFormatOption(Option::Universe u, ...@@ -829,7 +829,7 @@ OptionDefinition::factorySpecialFormatOption(Option::Universe u,
return (factoryIA6(getCode(), begin, end)); return (factoryIA6(getCode(), begin, end));
} else if (getCode() == D6O_IAADDR && haveIAAddr6Format()) { } else if (getCode() == D6O_IAADDR && haveIAAddr6Format()) {
// Rerurn Option6IAAddr option instance for the IAADDR // Return Option6IAAddr option instance for the IAADDR
// option only for the same reasons as described in // option only for the same reasons as described in
// for IA_NA and IA_PD above. // for IA_NA and IA_PD above.
return (factoryIAAddr6(getCode(), begin, end)); return (factoryIAAddr6(getCode(), begin, end));
......
...@@ -520,7 +520,7 @@ public: ...@@ -520,7 +520,7 @@ public:
/// and parse them. /// and parse them.
/// @param config is the configuration string to parse /// @param config is the configuration string to parse
/// ///
/// @return retuns 0 if the configuration parsed successfully, /// @return returns 0 if the configuration parsed successfully,
/// non-zero otherwise failure. /// non-zero otherwise failure.
int parseConfiguration(const std::string& config, bool v6 = false) { int parseConfiguration(const std::string& config, bool v6 = false) {
int rcode_ = 1; int rcode_ = 1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment