From 2f9c2b0d65ca6272e6f6cd86c66a187c00ce3890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Sat, 31 Aug 2019 18:34:49 +0200 Subject: [PATCH 1/2] WSEvents(nsToTimestamp): fix sprintf format warning --- src/WSEvents.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WSEvents.cpp b/src/WSEvents.cpp index 78635119..436420ff 100644 --- a/src/WSEvents.cpp +++ b/src/WSEvents.cpp @@ -40,7 +40,7 @@ const char* nsToTimestamp(uint64_t ns) { uint64_t msPart = ms % 1000; char* ts = (char*)bmalloc(64); - sprintf(ts, "%02lu:%02lu:%02lu.%03lu", hoursPart, minutesPart, secsPart, msPart); + sprintf(ts, "%02llu:%02llu:%02llu.%03llu", hoursPart, minutesPart, secsPart, msPart); return ts; } From 1ee58571391f445ff751afc236ba917bba339bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Sat, 31 Aug 2019 21:35:58 +0200 Subject: [PATCH 2/2] WSEvents(nsToTimestamp): use unsigned long long constants --- src/WSEvents.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/WSEvents.cpp b/src/WSEvents.cpp index 436420ff..ee9b86e1 100644 --- a/src/WSEvents.cpp +++ b/src/WSEvents.cpp @@ -30,14 +30,14 @@ #define STATUS_INTERVAL 2000 const char* nsToTimestamp(uint64_t ns) { - uint64_t ms = ns / (1000 * 1000); - uint64_t secs = ms / 1000; - uint64_t minutes = secs / 60; + uint64_t ms = ns / 1000000ULL; + uint64_t secs = ms / 1000ULL; + uint64_t minutes = secs / 60ULL; - uint64_t hoursPart = minutes / 60; - uint64_t minutesPart = minutes % 60; - uint64_t secsPart = secs % 60; - uint64_t msPart = ms % 1000; + uint64_t hoursPart = minutes / 60ULL; + uint64_t minutesPart = minutes % 60ULL; + uint64_t secsPart = secs % 60ULL; + uint64_t msPart = ms % 1000ULL; char* ts = (char*)bmalloc(64); sprintf(ts, "%02llu:%02llu:%02llu.%03llu", hoursPart, minutesPart, secsPart, msPart);