[2123] Scope of variables

diff --git a/src/lib/config/module_spec.cc b/src/lib/config/module_spec.cc
index 98a991da693277df0008ebc144be35a07f2545f1..781fed2eeb32dea6e1d750a619f1ec4791f00edc 100644 (file)
--- 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/util/filename.cc b/src/lib/util/filename.cc
index d7da9c81d4923735d77b2394a4d10fd628ca9026..d6951dc94ae4a2ee96e49a335880822594a61143 100644 (file)
--- 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 89edcc9c753b8927f088997c80d1c4db1d35c228..8ed88cbfb29262545b0bf32418ccdcc874cbd058 100644 (file)
--- 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);