summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2019-10-30 12:08:43 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2019-10-30 12:08:43 +0100
commitb444a31cba3f4913ab86878f84c2a45eb0b9bce1 (patch)
tree0c9a7297891834d9ea4e45b16ade639295041ff8
parentca773982f97d30789a2954c149585f0869019b09 (diff)
downloaddabmux-b444a31cba3f4913ab86878f84c2a45eb0b9bce1.tar.gz
dabmux-b444a31cba3f4913ab86878f84c2a45eb0b9bce1.tar.bz2
dabmux-b444a31cba3f4913ab86878f84c2a45eb0b9bce1.zip
Pull code from common commit 67a62df, replacing put_time
-rw-r--r--lib/edi/common.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/edi/common.cpp b/lib/edi/common.cpp
index ac8ec0c..d6ca89c 100644
--- a/lib/edi/common.cpp
+++ b/lib/edi/common.cpp
@@ -22,7 +22,6 @@
#include "buffer_unpack.hpp"
#include "Log.h"
#include "crc.h"
-#include <iomanip>
#include <sstream>
#include <cassert>
#include <cmath>
@@ -48,8 +47,14 @@ string frame_timestamp_t::to_string() const
else {
ss << "Timestamp not valid: ";
}
- ss << std::put_time(std::gmtime(&seconds_in_unix_epoch), "%c %Z") <<
- " + " << ((double)tsta / 16384000.0);
+
+ char timestr[100];
+ if (std::strftime(timestr, sizeof(timestr), "%Y-%m-%dZ%H:%M:%S", std::gmtime(&seconds_in_unix_epoch))) {
+ ss << timestr << " + " << ((double)tsta / 16384000.0);
+ }
+ else {
+ ss << "unknown";
+ }
return ss.str();
}