X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/3ee15695bbd86c97088270b855f810279c2b8275..2efac265830ab1b6cd1e3e0d4b04076174dd3b16:/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 605b9951..6734a435 100644 --- a/stglibs/common.lib/include/stg/common.h +++ b/stglibs/common.lib/include/stg/common.h @@ -57,16 +57,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); -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); -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); @@ -76,9 +77,9 @@ void WinToKOI(const std::string & s1, std::string * s2); 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 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); @@ -97,10 +98,9 @@ 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 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 C Split(const std::string & value, char delim, F conv) @@ -112,7 +112,7 @@ while (pos != std::string::npos) { 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; @@ -144,11 +144,17 @@ int ParseYesNo(const std::string & str, bool * val); 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); + +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); -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); @@ -205,7 +211,7 @@ int str2x(const std::string & str, varT & x) x += str[i] - '0'; } - x *= minus; + x*= minus; return 0; }