BIND 10 master, updated. 574d7f3c399acd6b1f88065559e9a0e1141a1232 [2123] Small performance improvements in tests

[BIND 10 source code commits]

The branch, master has been updated
       via  574d7f3c399acd6b1f88065559e9a0e1141a1232 (commit)
       via  4fc454db42761749f68e5bad2602841fb7cfaa9d (commit)
      from  412e1fc061aa852fad8053bf04d8cf0ce878e42d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 574d7f3c399acd6b1f88065559e9a0e1141a1232
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Jul 18 16:47:38 2012 +0200

    [2123] Small performance improvements in tests
    
    As suggested by cppcheck.

commit 4fc454db42761749f68e5bad2602841fb7cfaa9d
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Jul 18 16:41:12 2012 +0200

    [2123] Scope of variables

-----------------------------------------------------------------------

Summary of changes:
 src/lib/config/module_spec.cc                      |    2 +-
 src/lib/log/tests/logger_name_unittest.cc          |    6 +++---
 .../server_common/tests/socket_requestor_test.cc   |    2 +-
 src/lib/util/filename.cc                           |    2 +-
 src/lib/util/strutil.cc                            |    3 +--
 5 files changed, 7 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/config/module_spec.cc b/src/lib/config/module_spec.cc
index 98a991d..781fed2 100644
--- a/src/lib/config/module_spec.cc
+++ b/src/lib/config/module_spec.cc
@@ -476,9 +476,9 @@ ModuleSpec::validateSpecList(ConstElementPtr spec, ConstElementPtr data,
     typedef std::pair<std::string, ConstElementPtr> maptype;
     
     BOOST_FOREACH(maptype m, data->mapValue()) {
-        bool found = false;
         // Ignore 'version' as a config element
         if (m.first.compare("version") != 0) {
+            bool found = false;
             BOOST_FOREACH(ConstElementPtr cur_spec_el, spec->listValue()) {
                 if (cur_spec_el->get("item_name")->stringValue().compare(m.first) == 0) {
                     found = true;
diff --git a/src/lib/log/tests/logger_name_unittest.cc b/src/lib/log/tests/logger_name_unittest.cc
index 51fead5..39f5ed1 100644
--- a/src/lib/log/tests/logger_name_unittest.cc
+++ b/src/lib/log/tests/logger_name_unittest.cc
@@ -31,9 +31,9 @@ using namespace isc::log;
 
 class LoggerNameTest : public ::testing::Test {
 public:
-    LoggerNameTest() {
-        name_ = getRootLoggerName();
-    }
+    LoggerNameTest() :
+        name_(getRootLoggerName())
+    {}
     ~LoggerNameTest() {
         setRootLoggerName(name_);
     }
diff --git a/src/lib/server_common/tests/socket_requestor_test.cc b/src/lib/server_common/tests/socket_requestor_test.cc
index 9adf84d..9878c63 100644
--- a/src/lib/server_common/tests/socket_requestor_test.cc
+++ b/src/lib/server_common/tests/socket_requestor_test.cc
@@ -450,7 +450,7 @@ private:
     // NOTE: client_fd could leak on exception.  This should be cleaned up.
     // See the note about SocketSessionReceiver in socket_request.cc.
     void
-    serve(const std::vector<std::pair<std::string, int> > data) {
+    serve(const std::vector<std::pair<std::string, int> >& data) {
         const int client_fd = accept(fd_, NULL, NULL);
         if (client_fd == -1) {
             isc_throw(Unexpected, "Error in accept(): " << strerror(errno));
diff --git a/src/lib/util/filename.cc b/src/lib/util/filename.cc
index d7da9c8..d6951dc 100644
--- a/src/lib/util/filename.cc
+++ b/src/lib/util/filename.cc
@@ -34,9 +34,9 @@ Filename::split(const string& full_name, string& directory,
     string& name, string& extension) const
 {
     directory = name = extension = "";
-    bool dir_present = false;
     if (!full_name.empty()) {
 
+        bool dir_present = false;
         // Find the directory.
         size_t last_slash = full_name.find_last_of('/');
         if (last_slash != string::npos) {
diff --git a/src/lib/util/strutil.cc b/src/lib/util/strutil.cc
index 89edcc9..8ed88cb 100644
--- a/src/lib/util/strutil.cc
+++ b/src/lib/util/strutil.cc
@@ -39,10 +39,9 @@ normalizeSlash(std::string& name) {
 
 string
 trim(const string& instring) {
-    static const char* blanks = " \t\n";
-
     string retstring = "";
     if (!instring.empty()) {
+        static const char* blanks = " \t\n";
 
         // Search for first non-blank character in the string
         size_t first = instring.find_first_not_of(blanks);