From 4f696a4947f4ec26c3ffdd7fe3a785e1dfc10a2a Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 7 Mar 2022 12:46:27 +0100 Subject: [PATCH] bufsize const in messagetime() --- src/web/WebLogService.cpp | 6 +++--- src/web/WebLogService.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/web/WebLogService.cpp b/src/web/WebLogService.cpp index 949a647c9..357ae03f3 100644 --- a/src/web/WebLogService.cpp +++ b/src/web/WebLogService.cpp @@ -156,13 +156,13 @@ void WebLogService::loop() { } // convert time to real offset -char * WebLogService::messagetime(char * out, const uint64_t t, size_t bufsize) { +char * WebLogService::messagetime(char * out, const uint64_t t, const size_t bufsize) { if (!time_offset_) { strlcpy(out, uuid::log::format_timestamp_ms(t, 3).c_str(), bufsize); } else { time_t t1 = time_offset_ + t / 1000ULL; - strftime(out, 25, "%F %T", localtime(&t1)); - snprintf(out, 25, "%s.%03d", out, (uint16_t)(t % 1000)); + strftime(out, bufsize, "%F %T", localtime(&t1)); + snprintf(out, bufsize, "%s.%03d", out, (uint16_t)(t % 1000)); } return out; } diff --git a/src/web/WebLogService.h b/src/web/WebLogService.h index 4ae7b6434..55ca039f7 100644 --- a/src/web/WebLogService.h +++ b/src/web/WebLogService.h @@ -62,9 +62,10 @@ class WebLogService : public uuid::log::Handler { void fetchLog(AsyncWebServerRequest * request); void getValues(AsyncWebServerRequest * request); - char * messagetime(char * out, const uint64_t t, size_t bufsize); + char * messagetime(char * out, const uint64_t t, const size_t bufsize); + + void setValues(AsyncWebServerRequest * request, JsonVariant & json); - void setValues(AsyncWebServerRequest * request, JsonVariant & json); AsyncCallbackJsonWebHandler setValues_; // for POSTs uint64_t last_transmit_ = 0; // Last transmit time