2.2.3

psemiletov · May 5, 2019 · 550c51c · 550c51c
1 parent 55cf184
commit 550c51c
Show file tree

Hide file tree

Showing 3 changed files with 259 additions and 263 deletions.
diff --git a/libretta_pairfile.cpp b/libretta_pairfile.cpp
@@ -107,38 +107,37 @@ string CPairFile::get_string (const string &key,
 CPairFile::CPairFile (const string &fname, bool from_data)
 {
   if (from_data)
-    {
-     stringstream st (fname);
-     string line;
+     {
+      stringstream st (fname);
+      string line;
 
-     while (getline (st, line)) 
-           {
-            if (line.empty())
+      while (getline (st, line)) 
+            {
+             if (line.empty())
                continue;
 
-           // cout << "line: " << line << endl;
+            // cout << "line: " << line << endl;
 
-            size_t pos = line.find ("=");
+             size_t pos = line.find ("=");
 
             //cout << "pos: " << pos << endl;
 
-            if (pos == string::npos)
-                continue;
+             if (pos == string::npos)
+                 continue;
 
-            if (pos > line.size())
-                continue;
+             if (pos > line.size())
+                 continue;
 
-            string a = line.substr (0, pos);
-            string b = line.substr (pos + 1, line.size() - pos);
+             string a = line.substr (0, pos);
+             string b = line.substr (pos + 1, line.size() - pos);
 
-            //cout << a << ":" << b << endl;
+             //cout << a << ":" << b << endl;
 
-            values[a] = b;
-           }
+             values[a] = b;
+            }
 
-     return; 
-    }
-
+      return; //end "from data"
+     }
 
   file_name = fname;
 

diff --git a/libretta_utils.cpp b/libretta_utils.cpp
@@ -65,7 +65,7 @@ vector <string> files_get_list (const string &path, const string &ext) //ext wit
 
   vector <string> result;
 
-  directory = opendir(path.c_str());
+  directory = opendir (path.c_str());
   if (! directory)
      {
       closedir (directory);
@@ -77,7 +77,7 @@ vector <string> files_get_list (const string &path, const string &ext) //ext wit
           // std::cout << dir_entry->d_name << std::endl;
           string t = dir_entry->d_name;
           if (t.rfind (ext) != string::npos)
-            result.push_back (path + "/" + t);
+             result.push_back (path + "/" + t);
          }
 
    closedir (directory);