From a877e2750ac9caf33c4b3ba4ad73a1c7c45b9c59 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Wed, 28 Apr 2021 03:18:17 +0200 Subject: [PATCH] %zu fails on esp-idf, use uint16_t and %u instead --- src/hasp/hasp_dispatch.cpp | 2 +- src/lang/en_US.h | 2 +- src/lang/hu_HU.h | 2 +- src/lang/nl_NL.h | 2 +- src/lang/ro_RO.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index e5cf173b..f7eb6742 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -584,7 +584,7 @@ void dispatch_parse_jsonl(std::istream& stream) #endif { uint8_t savedPage = haspPages.get(); - size_t line = 1; + uint16_t line = 1; DynamicJsonDocument jsonl(MQTT_MAX_PACKET_SIZE / 2 + 128); // max ~256 characters per line DeserializationError jsonError = deserializeJson(jsonl, stream); diff --git a/src/lang/en_US.h b/src/lang/en_US.h index 53444e06..39e87b30 100644 --- a/src/lang/en_US.h +++ b/src/lang/en_US.h @@ -87,7 +87,7 @@ #define D_DISPATCH_REBOOT "Rebooting the MCU now!" #define D_JSON_FAILED "JSON parsing failed:" -#define D_JSONL_FAILED "JSONL parsing failed at line %zu" +#define D_JSONL_FAILED "JSONL parsing failed at line %u" #define D_JSONL_SUCCEEDED "Jsonl fully parsed" #define D_OTA_CHECK_UPDATE "Checking updates URL: %s" diff --git a/src/lang/hu_HU.h b/src/lang/hu_HU.h index f8c56a6c..4fd8831b 100644 --- a/src/lang/hu_HU.h +++ b/src/lang/hu_HU.h @@ -87,7 +87,7 @@ #define D_DISPATCH_REBOOT "Az MCU most újraindul!" #define D_JSON_FAILED "JSON elemzése nem sikerült:" -#define D_JSONL_FAILED "JSONL elemzése meghiúsult a %zu vonalnál" +#define D_JSONL_FAILED "JSONL elemzése meghiúsult a %u vonalnál" #define D_JSONL_SUCCEEDED "JSONL teljes körűen elemezve" #define D_OTA_CHECK_UPDATE "A frissítések ellenőrzése az URL-en: %s" diff --git a/src/lang/nl_NL.h b/src/lang/nl_NL.h index 8b2349dc..9c079c1e 100644 --- a/src/lang/nl_NL.h +++ b/src/lang/nl_NL.h @@ -86,7 +86,7 @@ #define D_DISPATCH_REBOOT "De MCU wordt herstart!" #define D_JSON_FAILED "JSON verwerking mislukt:" -#define D_JSONL_FAILED "JSONL verwerking mislukt op lijn %zu" +#define D_JSONL_FAILED "JSONL verwerking mislukt op lijn %u" #define D_JSONL_SUCCEEDED "Jsonl volledig verwerkt" #define D_OTA_CHECK_UPDATE "Controle update URL: %s" diff --git a/src/lang/ro_RO.h b/src/lang/ro_RO.h index 97859d71..f52b6e96 100644 --- a/src/lang/ro_RO.h +++ b/src/lang/ro_RO.h @@ -87,7 +87,7 @@ #define D_DISPATCH_REBOOT "MCU-ul repornește acum!" #define D_JSON_FAILED "Analiza JSON a eșuat:" -#define D_JSONL_FAILED "Analiza JSONL a eșuat la linia %zu" +#define D_JSONL_FAILED "Analiza JSONL a eșuat la linia %u" #define D_JSONL_SUCCEEDED "Analiza JSONL completă" #define D_OTA_CHECK_UPDATE "Verificare la URL-ul actualizărilor: %s"