[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 bb00b32ca35b89934a2bcb0aa9319442cf07d78c..41c642c5794118de6770cd4cda7e16c407a9a996 100644 (file)
--- 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 d7bf236c0e0bb045cc2accc5490ad71c312b10f4..203cb52f54052e3fede3bfb1bd307dad744cc865 100644 (file)
--- 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 b0a8f7b157f6e99ddccb7b7fdf9ce7fc8e8547f3..d85333002329c04c51f43a52db314a488fcf6bba 100644 (file)
--- 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 f3a44f85065274e6c9976479f11079255dc3b394..deab59a6925eb97c8ce9c845d27f0aaa0ef87597 100644 (file)
--- a/src/bin/agent/tests/basic_library.cc
+++ b/src/bin/agent/tests/basic_library.cc
@@ -15,7 +15,6 @@
 
 #include <config.h>
 #include <hooks/hooks.h>
-#include <fstream>
 
 using namespace isc::hooks;
 using namespace std;

diff --git a/src/lib/hooks/tests/.gitignore b/src/lib/hooks/tests/.gitignore
index 6fa0ec3e0cfbe442d5b043a047d628b5e5c3d360..c0fc13f4f9882b9a7146b4d64ff677871087dfd1 100644 (file)
--- a/src/lib/hooks/tests/.gitignore
+++ b/src/lib/hooks/tests/.gitignore
@@ -1,4 +1,3 @@
 /marker_file.h
 /test_libraries.h
-
 /run_unittests