Ticket 37. formatTime() changed to x2str() for the ChangePolicyTimeout

[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 90bd639d46dd56f8d71c445ec262a1dbba42a72c..8e82d2a84e17b099ef63a8b0ad288cc3bdc66c06 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -31,6 +31,7 @@
 #include <time.h>
 #else
 #include <ctime>
 #include <time.h>
 #else
 #include <ctime>

+#include <climits> // NAME_MAX

 #endif
 #include <string>
 #include <sstream>
 #endif
 #include <string>
 #include <sstream>


@@ -57,16 +58,17 @@ const char    * IntToKMG(int64_t a, int statType = ST_F);
 const char    * LogDate(time_t t);
 int             ParesTimeStat(const char * str);
 int             IsTimeStat(struct tm * t, int statTime);
 const char    * LogDate(time_t t);
 int             ParesTimeStat(const char * str);
 int             IsTimeStat(struct tm * t, int statTime);

-int             strtodouble2(const char * str, double & value);
-inline int      strtodouble2(const std::string & str, double & value) { return strtodouble2(str.c_str(), value); }
+/*bool            IsDigit(char c);
+bool            IsAlpha(char c);*/
+int             strtodouble2(const char * s, double &a);

 int             printfd(const char * __file__, const char * fmt, ...);
 void            Encode12(char * dst, const char * src, size_t srcLen);
 void            Decode21(char * dst, const char * src);
 
 void            Encode12str(std::string & dst, const std::string & src);
 void            Decode21str(std::string & dst, const std::string & src);
 int             printfd(const char * __file__, const char * fmt, ...);
 void            Encode12(char * dst, const char * src, size_t srcLen);
 void            Decode21(char * dst, const char * src);
 
 void            Encode12str(std::string & dst, const std::string & src);
 void            Decode21str(std::string & dst, const std::string & src);

-std::string     Encode12str(const std::string & src);
-std::string     Decode21str(const std::string & src);
+inline std::string Encode12str(const std::string & src) { std::string dst; Encode12str(dst, src); return dst; }
+inline std::string Decode21str(const std::string & src) { std::string dst; Decode21str(dst, src); return dst; }

 
 int             ParseIPString(const char * str, uint32_t * ips, int maxIP);
 void            KOIToWin(const char * s1, char * s2, int l);
 
 int             ParseIPString(const char * str, uint32_t * ips, int maxIP);
 void            KOIToWin(const char * s1, char * s2, int l);


@@ -76,9 +78,9 @@ void            WinToKOI(const std::string & s1, std::string * s2);
 int             DaysInMonth(unsigned year, unsigned mon);
 int             DaysInCurrentMonth();
 int             Min8(int a);
 int             DaysInMonth(unsigned year, unsigned mon);
 int             DaysInCurrentMonth();
 int             Min8(int a);

+//char          * inet_ntostr(unsigned long);

 std::string     inet_ntostring(uint32_t);
 uint32_t        inet_strington(const std::string & value);
 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,13 +99,11 @@ void            SwapBytes(int64_t & value);
 std::string &   TrimL(std::string & val);
 std::string &   TrimR(std::string & val);
 std::string &   Trim(std::string & val);
 std::string &   TrimL(std::string & val);
 std::string &   TrimR(std::string & val);
 std::string &   Trim(std::string & val);

-std::string     Trim(const std::string & val);

 
 

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

 
 template <typename C, typename F>
 
 template <typename C, typename F>

-inline

 C Split(const std::string & value, char delim, F conv)
 {
 C res;
 C Split(const std::string & value, char delim, F conv)
 {
 C res;


@@ -120,7 +120,6 @@ return res;
 }
 
 template <typename T>
 }
 
 template <typename T>

-inline

 T FromString(const std::string & value)
 {
 T res;
 T FromString(const std::string & value)
 {
 T res;


@@ -129,18 +128,10 @@ stream >> res;
 return res;
 }
 
 return res;
 }
 

-template <>
-inline
-std::string FromString<std::string>(const std::string & value)
-{
-return value;
-}
-

 template <typename C>
 template <typename C>

-inline

 C Split(const std::string & value, char delim)
 {
 C Split(const std::string & value, char delim)
 {

-    return Split<C>(value, delim, FromString<typename C::value_type>);
+    return Split<C>(value, delim, FromString);

 }
 
 std::string IconvString(const std::string & source, const std::string & from, const std::string & to);
 }
 
 std::string IconvString(const std::string & source, const std::string & from, const std::string & to);


@@ -159,11 +150,12 @@ bool WriteAll(int sd, const void * source, size_t size);
 
 std::string ToPrintable(const std::string & src);
 
 
 std::string ToPrintable(const std::string & src);
 

+std::string formatTime(time_t value);
+time_t readTime(const std::string & value);

 //-----------------------------------------------------------------------------
 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); }
+int str2x(const std::string & str, double & 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);


@@ -220,7 +212,7 @@ int str2x(const std::string & str, varT & x)
         x += str[i] - '0';
     }
 
         x += str[i] - '0';
     }
 

-    x *= minus;
+    x*= minus;

 
     return 0;
 }
 
     return 0;
 }