Refactor some utility code

Author: flanglet

src/util.hpp

@@ -18,12 +18,8 @@ limitations under the License.
 #define _util_
 
 
-#include <cstdlib>
-#include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <string>
-#include <vector>
 #include "types.hpp"
 
 
@@ -47,57 +43,4 @@ struct istreambuf : public std::basic_streambuf<T, std::char_traits<T> >
     }
 };
 
-inline int tokenizeCSV(std::string& s, std::vector<std::string>& tokens, char delim = ',')
-{
-    std::stringstream ss;
-    char prv = 0;
-
-    for (auto& c : s) {
-        if (c == delim) {
-            if (prv != '\\') {
-                std::string tk = ss.str();
-                tokens.push_back(tk);
-                ss.str("");
-                prv = 0;
-                continue;
-            }
-        }
-
-        ss << c;
-        prv = c;
-    }
-
-    std::string tk = ss.str();
-
-    if (tk.size() > 0)
-        tokens.push_back(tk);
-
-    return tokens.size();
-}
-
-inline std::string formatSize(const std::string& input)
-{           
-    double size = atof(input.c_str());;
-    std::stringstream ss;
-    std::string s = input;
-                  
-    if (size >= double(1 << 30)) {     
-       size /= double(1024 * 1024 * 1024);
-       ss << std::fixed << std::setprecision(2) << size << " GiB";
-       s = ss.str(); 
-    }             
-    else if (size >= double(1 << 20)) {
-       size  /= double(1024 * 1024);
-       ss << std::fixed << std::setprecision(2) << size << " MiB";
-       s = ss.str(); 
-    }
-    else if (size >= double(1 << 10)) {
-       size /= double(1024);
-       ss << std::fixed << std::setprecision(2) << size << " KiB";
-       s = ss.str();  
-    }
-                   
-   return s;   
-}
-
 #endif

src/util/Printer.hpp

@@ -45,7 +45,7 @@ namespace kanzi
    #ifdef CONCURRENCY_ENABLED
                std::lock_guard<std::mutex> lock(_mtx);
    #endif
-               (*_os) << msg ;
+               (*_os) << msg;
             }
          }
 
@@ -63,7 +63,7 @@ namespace kanzi
    #ifdef CONCURRENCY_ENABLED
                std::lock_guard<std::mutex> lock(_mtx);
    #endif
-               (*_os) << msg ;
+               (*_os) << msg;
             }
          }
 

src/util/strings.hpp

@@ -17,6 +17,8 @@ limitations under the License.
 #ifndef _strings_
 #define _strings_
 
+#include <cstdlib>
+#include <iomanip>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -88,5 +90,58 @@ inline void tokenize(const std::string& str, std::vector<std::string>& v, char t
       v.push_back(s);   
 }    
 
+inline int tokenizeCSV(std::string& s, std::vector<std::string>& tokens, char delim = ',')
+{
+    std::stringstream ss;
+    char prv = 0;
+
+    for (auto& c : s) {
+        if (c == delim) {
+            if (prv != '\\') {
+                std::string tk = ss.str();
+                tokens.push_back(tk);
+                ss.str("");
+                prv = 0;
+                continue;
+            }
+        }
+
+        ss << c;
+        prv = c;
+    }
+
+    std::string tk = ss.str();
+
+    if (tk.size() > 0)
+        tokens.push_back(tk);
+
+    return tokens.size();
+}
+
+inline std::string formatSize(const std::string& input)
+{
+    double size = atof(input.c_str());
+    std::stringstream ss;
+    std::string s = input;
+
+    if (size >= double(1 << 30)) {
+       size /= double(1024 * 1024 * 1024);
+       ss << std::fixed << std::setprecision(2) << size << " GiB";
+       s = ss.str();
+    }
+    else if (size >= double(1 << 20)) {
+       size  /= double(1024 * 1024);
+       ss << std::fixed << std::setprecision(2) << size << " MiB";
+       s = ss.str();
+    }
+    else if (size >= double(1 << 10)) {
+       size /= double(1024);
+       ss << std::fixed << std::setprecision(2) << size << " KiB";
+       s = ss.str();
+    }
+
+   return s;
+}
+
 #endif