cpp/src/CMakeLists.txt

@@ -1,10 +1,12 @@
 set(monoformat_SOURCES
     monoformat_schema.cpp
+    monoformat_structured.cpp
     monoformat_parseonly.cpp
     monoformat_fontreader.cpp
 )
 set(monoformat_HEADERS
     monoformat_schema.hpp
+    monoformat_structured.hpp
     monoformat_parsehelpers.hpp
     monoformat_parseonly.hpp
     monoformat_fontreader.hpp
@@ -12,18 +14,6 @@ set(monoformat_HEADERS
     monoformat_utf8.hpp
 )
 
-option(MONOFORMAT_EMBEDDED "Only build for embedded devices" FALSE)
-
-if(NOT MONOFORMAT_EMBEDDED)
-    list(APPEND monoformat_SOURCES
-        monoformat_structured.cpp
-    )
-
-    list(APPEND monoformat_HEADERS
-        monoformat_structured.hpp
-    )
-endif()
-
 add_library(monoformat ${monoformat_SOURCES} ${monoformat_HEADERS})
 target_compile_features(monoformat PUBLIC cxx_std_23)
 target_include_directories(monoformat PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

cpp/src/monoformat_parseonly.cpp

@@ -4,7 +4,7 @@
 
 #include <string_view>
 #include <string>
-#include <cstdio>
+#include <format>
 #include <iostream>
 
 namespace monoformat {
@@ -1029,19 +1029,17 @@ std::expected<void, ParseError> handleCurrentTime(std::span<std::byte const>& bu
         }
     }
 
-    char text[32] = {};
+    std::string text;
     if (showHours && showMinutes && showSeconds) {
-        std::snprintf(text, sizeof(text), "%02d:%02d:%02d", int(hours), int(minutes), int(seconds));
+        text = std::format("{:02d}:{:02d}:{:02d}", hours, minutes, seconds);
     } else if (showHours && showMinutes) {
-        std::snprintf(text, sizeof(text), "%02d:%02d", int(hours), int(minutes));
+        text = std::format("{:02d}:{:02d}", hours, minutes);
     } else if (showHours) {
-        std::snprintf(text, sizeof(text), "%02d", int(hours));
+        text = std::format("{:02d}", hours);
     } else if (showMinutes && showSeconds) {
-        std::snprintf(text, sizeof(text), "%02d:%02d", int(minutes), int(seconds));
+        text = std::format("{:02d}:{:02d}", minutes, seconds);
     } else if (showSeconds) {
-        std::snprintf(text, sizeof(text), "%02d", int(seconds));
+        text = std::format("{:02d}", seconds);
-    } else if (showMinutes) {
-        std::snprintf(text, sizeof(text), "%02d", int(minutes));
     } else {
         return {};
     }