X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9bcc50116ad21379a31ab8d65deb36688f2044b3..ed482e49fcd8341061473ff39e683a951b84da20:/stglibs/common.lib/include/stg/common.h?ds=sidebyside diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h index 0791f093..f46c922a 100644 --- 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); +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); @@ -97,6 +99,9 @@ std::string & TrimL(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 C Split(const std::string & value, char delim, F conv) { @@ -142,6 +147,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); @@ -161,11 +168,11 @@ int str2x(const std::string & str, varT & x); template const std::string & x2str(varT x, std::string & s); template -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 const std::string & unsigned2str(varT x, std::string & s); template -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