ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/zoneminder

This commit is contained in:
Isaac Connor 2021-12-16 17:02:33 -05:00
parent ee129ba2e3 1bc0e1820e
commit d128e3befc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_time.cpp
View File

@ -28,7 +28,7 @@ std::string SystemTimePointToString(SystemTimePoint tp) {
std::string timeString; std::string timeString;
timeString.reserve(64); timeString.reserve(64);
char *timePtr = timeString.data(); char *timePtr = &*(timeString.begin());
tm tp_tm = {}; tm tp_tm = {};
timePtr += strftime(timePtr, timeString.capacity(), "%x %H:%M:%S", localtime_r(&tp_sec, &tp_tm)); timePtr += strftime(timePtr, timeString.capacity(), "%x %H:%M:%S", localtime_r(&tp_sec, &tp_tm));
snprintf(timePtr, timeString.capacity() - (timePtr - timeString.data()), ".%06" PRIi64, static_cast<int64_t>(now_frac.count())); snprintf(timePtr, timeString.capacity() - (timePtr - timeString.data()), ".%06" PRIi64, static_cast<int64_t>(now_frac.count()));
@ -44,7 +44,7 @@ std::string TimePointToString(TimePoint tp) {
std::string timeString; std::string timeString;
timeString.reserve(64); timeString.reserve(64);
char *timePtr = timeString.data(); char *timePtr = &*(timeString.begin());
tm tp_tm = {}; tm tp_tm = {};
timePtr += strftime(timePtr, timeString.capacity(), "%x %H:%M:%S", localtime_r(&tp_sec, &tp_tm)); timePtr += strftime(timePtr, timeString.capacity(), "%x %H:%M:%S", localtime_r(&tp_sec, &tp_tm));
snprintf(timePtr, timeString.capacity() - (timePtr - timeString.data()), ".%06" PRIi64, static_cast<int64_t>(now_frac.count())); snprintf(timePtr, timeString.capacity() - (timePtr - timeString.data()), ".%06" PRIi64, static_cast<int64_t>(now_frac.count()));