From: Tomek Mrugalski Date: Thu, 2 Mar 2017 00:45:51 +0000 (+0100) Subject: [5134_rebase] Changes after review: X-Git-Tag: trac5137_base~3^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a904d5f7ea18239e61db2e1da2183035e231464b;p=thirdparty%2Fkea.git [5134_rebase] Changes after review: - comments updated - parameters passed by const reference - .gitignore updated - unnecessary header removed --- diff --git a/src/bin/agent/simple_parser.cc b/src/bin/agent/simple_parser.cc index bb00b32ca3..41c642c579 100644 --- a/src/bin/agent/simple_parser.cc +++ b/src/bin/agent/simple_parser.cc @@ -49,7 +49,7 @@ const SimpleDefaults AgentSimpleParser::SOCKET_DEFAULTS = { /// --- end of default values ------------------------------------------------- /// --------------------------------------------------------------------------- -size_t AgentSimpleParser::setAllDefaults(isc::data::ElementPtr global) { +size_t AgentSimpleParser::setAllDefaults(const isc::data::ElementPtr& global) { size_t cnt = 0; // Set global defaults first. @@ -78,7 +78,8 @@ size_t AgentSimpleParser::setAllDefaults(isc::data::ElementPtr global) { } void -AgentSimpleParser::parse(CtrlAgentCfgContextPtr ctx, isc::data::ConstElementPtr config, +AgentSimpleParser::parse(const CtrlAgentCfgContextPtr& ctx, + const isc::data::ConstElementPtr& config, bool check_only) { // Let's get the HTTP parameters first. diff --git a/src/bin/agent/simple_parser.h b/src/bin/agent/simple_parser.h index d7bf236c0e..203cb52f54 100644 --- a/src/bin/agent/simple_parser.h +++ b/src/bin/agent/simple_parser.h @@ -13,11 +13,12 @@ namespace isc { namespace agent { -/// @brief SimpleParser specialized for DHCPv4 +/// @brief SimpleParser specialized for Control Agent +/// +/// This class is a @ref isc::data::SimpleParser dedicated to Control Agent. +/// In particular, it contains all the default values for the whole +/// agent and for the socket defaults. /// -/// This class is a @ref isc::data::SimpleParser dedicated to DHCPv4 parser. -/// In particular, it contains all the default values and names of the -/// parameters that are to be derived (inherited) between scopes. /// For the actual values, see @file agent/simple_parser.cc class AgentSimpleParser : public isc::data::SimpleParser { public: @@ -27,7 +28,7 @@ public: /// /// @param global scope to be filled in with defaults. /// @return number of default values added - static size_t setAllDefaults(isc::data::ElementPtr global); + static size_t setAllDefaults(const isc::data::ElementPtr& global); /// @brief Parses the control agent configuration /// @@ -36,7 +37,8 @@ public: /// @param check_only - if true the configuration is verified only, not applied /// /// @throw ConfigError if any issues are encountered. - void parse(CtrlAgentCfgContextPtr ctx, isc::data::ConstElementPtr config, + void parse(const CtrlAgentCfgContextPtr& ctx, + const isc::data::ConstElementPtr& config, bool check_only); // see simple_parser.cc for comments for those parameters diff --git a/src/bin/agent/tests/.gitignore b/src/bin/agent/tests/.gitignore index b0a8f7b157..d853330023 100644 --- a/src/bin/agent/tests/.gitignore +++ b/src/bin/agent/tests/.gitignore @@ -1,2 +1,3 @@ -/ctrl_agent_unittest +/run_unittest /ctrl_agent_process_tests.sh +/test_libraries.h diff --git a/src/bin/agent/tests/basic_library.cc b/src/bin/agent/tests/basic_library.cc index f3a44f8506..deab59a692 100644 --- a/src/bin/agent/tests/basic_library.cc +++ b/src/bin/agent/tests/basic_library.cc @@ -15,7 +15,6 @@ #include #include -#include using namespace isc::hooks; using namespace std; diff --git a/src/lib/hooks/tests/.gitignore b/src/lib/hooks/tests/.gitignore index 6fa0ec3e0c..c0fc13f4f9 100644 --- a/src/lib/hooks/tests/.gitignore +++ b/src/lib/hooks/tests/.gitignore @@ -1,4 +1,3 @@ /marker_file.h /test_libraries.h - /run_unittests