Ticket 37. The true parameter changed to false in ensure_equals()

[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 1dd8c1c72f7694c7049abdf2650e1b0851b3ec05..af0f89a181c66dafd477356a5429f6baf148d7e2 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -66,6 +66,8 @@ 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);
 
 void            Encode12str(std::string & dst, const std::string & src);
 void            Decode21str(std::string & dst, 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);


@@ -97,6 +99,9 @@ std::string &   TrimL(std::string & val);
 std::string &   TrimR(std::string & val);
 std::string &   Trim(std::string & val);
 
 std::string &   TrimR(std::string & val);
 std::string &   Trim(std::string & val);
 

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

 template <typename C, typename F>
 C Split(const std::string & value, char delim, F conv)
 {
 template <typename C, typename F>
 C Split(const std::string & value, char delim, F conv)
 {


@@ -107,7 +112,7 @@ while (pos != std::string::npos)
     {
     res.push_back(conv(value.substr(startPos, pos - startPos)));
     startPos = pos + 1;
     {
     res.push_back(conv(value.substr(startPos, pos - startPos)));
     startPos = pos + 1;

-    pos = value.find_first_of(delim, pos);
+    pos = value.find_first_of(delim, pos + 1);

     }
 res.push_back(conv(value.substr(startPos, pos - startPos)));
 return res;
     }
 res.push_back(conv(value.substr(startPos, pos - startPos)));
 return res;


@@ -139,9 +144,15 @@ 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);

+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);


@@ -158,11 +169,11 @@ int str2x(const std::string & str, varT & x);
 template <typename varT>
 const std::string & x2str(varT x, std::string & s);
 template <typename varT>
 template <typename varT>
 const std::string & x2str(varT x, std::string & s);
 template <typename varT>

-const std::string & x2str(varT x) { std::string s; return x2str(x, s); }
+std::string x2str(varT x) { std::string s; return x2str(x, s); }

 template <typename varT>
 const std::string & unsigned2str(varT x, std::string & s);
 template <typename varT>
 template <typename varT>
 const std::string & unsigned2str(varT x, std::string & s);
 template <typename varT>

-const std::string & unsigned2str(varT x) { std::string s; return unsigned2str(x, s); }
+std::string unsigned2str(varT x) { std::string s; return unsigned2str(x, s); }

 
 //-----------------------------------------------------------------------------
 template <typename varT>
 
 //-----------------------------------------------------------------------------
 template <typename varT>