X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/01cdd74060b063287784d3aff7f9f861a404b789..2de285bd51f7e0c3f245b7f9d7144343b983ca44:/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 263cfe37..41cdfa56 100644 --- a/stglibs/common.lib/include/stg/common.h +++ b/stglibs/common.lib/include/stg/common.h @@ -33,6 +33,7 @@ #include #endif #include +#include #include "stg/os_int.h" #include "stg/const.h" @@ -77,6 +78,7 @@ int DaysInCurrentMonth(); int Min8(int a); 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); @@ -100,7 +102,48 @@ std::string Trim(const std::string & val); std::string ToLower(const std::string & value); std::string ToUpper(const std::string & value); -std::string IconvString(const std::string & source, const std::string & from, const std::string & to); +template +inline +C Split(const std::string & value, char delim, F conv) +{ +C res; +size_t startPos = 0; +size_t pos = value.find_first_of(delim); +while (pos != std::string::npos) + { + res.push_back(conv(value.substr(startPos, pos - startPos))); + startPos = pos + 1; + pos = value.find_first_of(delim, pos + 1); + } +res.push_back(conv(value.substr(startPos, pos - startPos))); +return res; +} + +template +inline +T FromString(const std::string & value) +{ +T res; +std::istringstream stream(value); +stream >> res; +return res; +} + +template <> +inline +std::string FromString(const std::string & value) +{ +return value; +} + +template +inline +C Split(const std::string & value, char delim) +{ + return Split(value, delim, FromString); +} + +std::string IconvString(const std::string & source, const std::string & from, const std::string & to); int ParseInt(const std::string & str, int * val); int ParseUnsigned(const std::string & str, unsigned * val); @@ -111,6 +154,9 @@ 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); + //----------------------------------------------------------------------------- int str2x(const std::string & str, int32_t & x); int str2x(const std::string & str, uint32_t & x);