stg-2.409 pre-merge.

[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 41cdfa56015f2f83793a9a1dd1a202d9190e738d..623d82d073aed1552bf531df2e40e4d86080f560 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -65,8 +65,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);
-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);
@@ -99,8 +99,8 @@ std::string &   TrimR(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);
 
 template <typename C, typename F>
 inline
@@ -157,6 +157,8 @@ 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);