Simplified ToLower/ToUpper functions.

[stg.git] / stglibs / common.lib / include / stg / common.h

diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h
index f2e4e7e2432ab52aa75ed29efbe684726a7fe5ea..90bd639d46dd56f8d71c445ec262a1dbba42a72c 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -33,6 +33,7 @@
 #include <ctime>
 #endif
 #include <string>
 #include <ctime>
 #endif
 #include <string>

+#include <sstream>

 
 #include "stg/os_int.h"
 #include "stg/const.h"
 
 #include "stg/os_int.h"
 #include "stg/const.h"


@@ -77,6 +78,7 @@ int             DaysInCurrentMonth();
 int             Min8(int a);
 std::string     inet_ntostring(uint32_t);
 uint32_t        inet_strington(const std::string & value);
 int             Min8(int a);
 std::string     inet_ntostring(uint32_t);
 uint32_t        inet_strington(const std::string & value);

+std::string     TimeToString(time_t time);

 int             strprintf(std::string * str, const char * fmt, ...);
 int             ParseTariffTimeStr(const char * str, int &h1, int &m1, int &h2, int &m2);
 uint32_t        CalcMask(uint32_t msk);
 int             strprintf(std::string * str, const char * fmt, ...);
 int             ParseTariffTimeStr(const char * str, int &h1, int &m1, int &h2, int &m2);
 uint32_t        CalcMask(uint32_t msk);


@@ -97,10 +99,51 @@ std::string &   TrimR(std::string & val);
 std::string &   Trim(std::string & val);
 std::string     Trim(const std::string & val);
 
 std::string &   Trim(std::string & val);
 std::string     Trim(const std::string & val);
 

-std::string     ToLower(const std::string & value);
-std::string     ToUpper(const std::string & value);
+std::string     ToLower(std::string value);
+std::string     ToUpper(std::string value);

 
 

-std::string     IconvString(const std::string & source, const std::string & from, const std::string & to);
+template <typename C, typename F>
+inline
+C Split(const std::string & value, char delim, F conv)
+{
+C res;
+size_t startPos = 0;
+size_t pos = value.find_first_of(delim);
+while (pos != std::string::npos)
+    {
+    res.push_back(conv(value.substr(startPos, pos - startPos)));
+    startPos = pos + 1;
+    pos = value.find_first_of(delim, pos + 1);
+    }
+res.push_back(conv(value.substr(startPos, pos - startPos)));
+return res;
+}
+
+template <typename T>
+inline
+T FromString(const std::string & value)
+{
+T res;
+std::istringstream stream(value);
+stream >> res;
+return res;
+}
+
+template <>
+inline
+std::string FromString<std::string>(const std::string & value)
+{
+return value;
+}
+
+template <typename C>
+inline
+C Split(const std::string & value, char delim)
+{
+    return Split<C>(value, delim, FromString<typename C::value_type>);
+}
+
+std::string IconvString(const std::string & source, const std::string & from, const std::string & to);

 
 int ParseInt(const std::string & str, int * val);
 int ParseUnsigned(const std::string & str, unsigned * val);
 
 int ParseInt(const std::string & str, int * val);
 int ParseUnsigned(const std::string & str, unsigned * val);


@@ -111,9 +154,16 @@ int ParseYesNo(const std::string & str, bool * val);
 
 bool WaitPackets(int sd);
 
 
 bool WaitPackets(int sd);
 

+bool ReadAll(int sd, void * dest, size_t size);
+bool WriteAll(int sd, const void * source, size_t size);
+
+std::string ToPrintable(const std::string & src);
+

 //-----------------------------------------------------------------------------
 int str2x(const std::string & str, int32_t & x);
 int str2x(const std::string & str, uint32_t & x);
 //-----------------------------------------------------------------------------
 int str2x(const std::string & str, int32_t & x);
 int str2x(const std::string & str, uint32_t & x);

+inline
+int str2x(const std::string & str, double & x) { return strtodouble2(str.c_str(), x); }

 #ifndef WIN32
 int str2x(const std::string & str, int64_t & x);
 int str2x(const std::string & str, uint64_t & x);
 #ifndef WIN32
 int str2x(const std::string & str, int64_t & x);
 int str2x(const std::string & str, uint64_t & x);