From 70400bc83eaecfa49689576e350dbda6d862c671 Mon Sep 17 00:00:00 2001 From: Source61 <68166790+Source61@users.noreply.github.com> Date: Tue, 15 Sep 2020 18:58:47 +0200 Subject: [PATCH] Add optional format string for stdext::date_time_string() (#1110) --- src/framework/stdext/string.cpp | 6 +++--- src/framework/stdext/string.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/framework/stdext/string.cpp b/src/framework/stdext/string.cpp index 634f7fc6..dd80d383 100644 --- a/src/framework/stdext/string.cpp +++ b/src/framework/stdext/string.cpp @@ -45,13 +45,13 @@ std::string resolve_path(const std::string& filePath, std::string sourcePath) return sourcePath + filePath; } -std::string date_time_string() +std::string date_time_string(const char* format/* = "%b %d %Y %H:%M:%S"*/) { - char date[32]; + char date[100]; std::time_t tnow; std::time(&tnow); std::tm *ts = std::localtime(&tnow); - std::strftime(date, 32, "%b %d %Y %H:%M:%S", ts); + std::strftime(date, 100, format, ts); return std::string(date); } diff --git a/src/framework/stdext/string.h b/src/framework/stdext/string.h index 06125919..8262de9f 100644 --- a/src/framework/stdext/string.h +++ b/src/framework/stdext/string.h @@ -38,7 +38,7 @@ template T from_string(const std::string& str, T def = T()) { return /// Resolve a file path by combining sourcePath with filePath std::string resolve_path(const std::string& filePath, std::string sourcePath); /// Get current date and time in a std::string -std::string date_time_string(); +std::string date_time_string(const char* format = "%b %d %Y %H:%M:%S"); std::string dec_to_hex(uint64_t num); uint64_t hex_to_dec(const std::string& str);