diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Logging/LogMessage.cpp | 5 | ||||
| -rw-r--r-- | src/common/Utilities/Util.cpp | 4 | ||||
| -rw-r--r-- | src/common/Utilities/Util.h | 8 |
3 files changed, 3 insertions, 14 deletions
diff --git a/src/common/Logging/LogMessage.cpp b/src/common/Logging/LogMessage.cpp index f8fcdcc7eea..5f10087d1f0 100644 --- a/src/common/Logging/LogMessage.cpp +++ b/src/common/Logging/LogMessage.cpp @@ -16,6 +16,7 @@ */ #include "LogMessage.h" +#include "StringFormat.h" #include "Util.h" LogMessage::LogMessage(LogLevel _level, std::string const& _type, std::string&& _text) @@ -32,9 +33,7 @@ std::string LogMessage::getTimeStr(time_t time) { tm aTm; localtime_r(&time, &aTm); - char buf[20]; - snprintf(buf, 20, "%04d-%02d-%02d_%02d:%02d:%02d", aTm.tm_year + 1900, aTm.tm_mon + 1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); - return std::string(buf); + return Trinity::StringFormat("%04d-%02d-%02d_%02d:%02d:%02d", aTm.tm_year + 1900, aTm.tm_mon + 1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); } std::string LogMessage::getTimeStr() const diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 30bc25e4b04..2e5c3a266fe 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -283,9 +283,7 @@ std::string TimeToTimestampStr(time_t t) // HH hour (2 digits 00-23) // MM minutes (2 digits 00-59) // SS seconds (2 digits 00-59) - char buf[20]; - snprintf(buf, 20, "%04d-%02d-%02d_%02d-%02d-%02d", aTm.tm_year+1900, aTm.tm_mon+1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); - return std::string(buf); + return Trinity::StringFormat("%04d-%02d-%02d_%02d-%02d-%02d", aTm.tm_year + 1900, aTm.tm_mon + 1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); } std::string TimeToHumanReadable(time_t t) diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index 866e01e7bf6..2178deb5505 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -407,14 +407,6 @@ public: return !(*this == right); } - inline flag96& operator=(flag96 const& right) - { - part[0] = right.part[0]; - part[1] = right.part[1]; - part[2] = right.part[2]; - return *this; - } - inline flag96 operator&(flag96 const& right) const { return flag96(part[0] & right.part[0], part[1] & right.part[1], part[2] & right.part[2]); |
