From b13252a42dcc5d68d81ce98460d59bfbe081e5bc Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Wed, 28 Apr 2021 03:27:54 +0200 Subject: [PATCH] Eliminate %zu parameter --- src/hasp/hasp_dispatch.cpp | 2 +- src/hasp/hasp_page.cpp | 4 ++-- src/hasp/hasp_page.h | 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 +- src/mqtt/hasp_mqtt_paho_async.cpp | 2 +- src/mqtt/hasp_mqtt_paho_single.cpp | 2 +- src/mqtt/hasp_mqtt_pubsubclient.cpp | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index f7eb6742..effdeba8 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -912,7 +912,7 @@ void dispatch_statusupdate(const char*, const char*) haspDevice.get_free_heap(), haspDevice.get_heap_fragmentation(), haspDevice.get_core_version()); strcat(data, buffer); - snprintf_P(buffer, sizeof(buffer), PSTR("\"canUpdate\":\"false\",\"page\":%u,\"numPages\":%zu,"), + snprintf_P(buffer, sizeof(buffer), PSTR("\"canUpdate\":\"false\",\"page\":%u,\"numPages\":%u,"), haspPages.get(), haspPages.count()); strcat(data, buffer); diff --git a/src/hasp/hasp_page.cpp b/src/hasp/hasp_page.cpp index 9305cc4e..636f319d 100644 --- a/src/hasp/hasp_page.cpp +++ b/src/hasp/hasp_page.cpp @@ -21,9 +21,9 @@ Page::Page() // LVGL is not yet initialized at construction time } -size_t Page::count() +uint8_t Page::count() { - return sizeof(_pages) / sizeof(*_pages); + return (uint8_t)(sizeof(_pages) / sizeof(*_pages)); } void Page::init(uint8_t start_page) diff --git a/src/hasp/hasp_page.h b/src/hasp/hasp_page.h index ec94462e..03b55e08 100644 --- a/src/hasp/hasp_page.h +++ b/src/hasp/hasp_page.h @@ -33,7 +33,7 @@ class Page { public: Page(); - size_t count(); + uint8_t count(); void init(uint8_t start_page); void clear(uint8_t pageid); // void set(uint8_t pageid); diff --git a/src/lang/en_US.h b/src/lang/en_US.h index 39e87b30..6bc825de 100644 --- a/src/lang/en_US.h +++ b/src/lang/en_US.h @@ -47,7 +47,7 @@ #define D_MQTT_SUBSCRIBED "Subscribed to %s" #define D_MQTT_NOT_SUBSCRIBED "Failed to subscribe to %s" #define D_MQTT_HA_AUTO_DISCOVERY "Register HA auto-discovery" -#define D_MQTT_PAYLOAD_TOO_LONG "Payload too long (%zu bytes)" +#define D_MQTT_PAYLOAD_TOO_LONG "Payload too long (%u bytes)" #define D_TELNET_CLOSING_CONNECTION "Closing session from %s" #define D_TELNET_CLIENT_LOGIN_FROM "Client login from %s" diff --git a/src/lang/hu_HU.h b/src/lang/hu_HU.h index 4fd8831b..a6a2eb74 100644 --- a/src/lang/hu_HU.h +++ b/src/lang/hu_HU.h @@ -47,7 +47,7 @@ #define D_MQTT_SUBSCRIBED "Feliratkozva: %s" #define D_MQTT_NOT_SUBSCRIBED "Nem sikerült feliratkozni: %s" #define D_MQTT_HA_AUTO_DISCOVERY "Regisztrálás HA automatikus felfedezésre" -#define D_MQTT_PAYLOAD_TOO_LONG "$$$Payload too long (%zu bytes)" +#define D_MQTT_PAYLOAD_TOO_LONG "$$$Payload too long (%u bytes)" #define D_TELNET_CLOSING_CONNECTION "Munkamenet befejezése %s-el" #define D_TELNET_CLIENT_LOGIN_FROM "Kliens bejelentkezés innen: %s" diff --git a/src/lang/nl_NL.h b/src/lang/nl_NL.h index 9c079c1e..9147e1df 100644 --- a/src/lang/nl_NL.h +++ b/src/lang/nl_NL.h @@ -47,7 +47,7 @@ #define D_MQTT_SUBSCRIBED "Ingeschreven op %s" #define D_MQTT_NOT_SUBSCRIBED "Inschrijving op %s mislukt" #define D_MQTT_HA_AUTO_DISCOVERY "Registeren HA auto-configuratie" -#define D_MQTT_PAYLOAD_TOO_LONG "Payload is te lang (%zu bytes)" +#define D_MQTT_PAYLOAD_TOO_LONG "Payload is te lang (%u bytes)" #define D_TELNET_CLOSING_CONNECTION "Sessie sluiten van %s" #define D_TELNET_CLIENT_LOGIN_FROM "Client aangemeld van %s" diff --git a/src/lang/ro_RO.h b/src/lang/ro_RO.h index f52b6e96..dbab8379 100644 --- a/src/lang/ro_RO.h +++ b/src/lang/ro_RO.h @@ -47,7 +47,7 @@ #define D_MQTT_SUBSCRIBED "Abonat la %s" #define D_MQTT_NOT_SUBSCRIBED "Abonarea la %s a eșuat" #define D_MQTT_HA_AUTO_DISCOVERY "Înregistrare la auto-descoperire în HA" -#define D_MQTT_PAYLOAD_TOO_LONG "$$$Payload too long (%zu bytes)" +#define D_MQTT_PAYLOAD_TOO_LONG "$$$Payload too long (%u bytes)" #define D_TELNET_CLOSING_CONNECTION "Terminarea sesiunii de la %s" #define D_TELNET_CLIENT_LOGIN_FROM "Conectare client de la %s" diff --git a/src/mqtt/hasp_mqtt_paho_async.cpp b/src/mqtt/hasp_mqtt_paho_async.cpp index e2a1922d..aec077ee 100644 --- a/src/mqtt/hasp_mqtt_paho_async.cpp +++ b/src/mqtt/hasp_mqtt_paho_async.cpp @@ -126,7 +126,7 @@ void connlost(void* context, char* cause) static void mqtt_message_cb(char* topic, char* payload, size_t length) { // Handle incoming commands from MQTT if(length + 1 >= MQTT_MAX_PACKET_SIZE) { - LOG_ERROR(TAG_MQTT_RCV, F(D_MQTT_PAYLOAD_TOO_LONG), length); + LOG_ERROR(TAG_MQTT_RCV, F(D_MQTT_PAYLOAD_TOO_LONG), (uint32_t)length); return; } else { payload[length] = '\0'; diff --git a/src/mqtt/hasp_mqtt_paho_single.cpp b/src/mqtt/hasp_mqtt_paho_single.cpp index 3938f4f3..608855cb 100644 --- a/src/mqtt/hasp_mqtt_paho_single.cpp +++ b/src/mqtt/hasp_mqtt_paho_single.cpp @@ -120,7 +120,7 @@ void connlost(void* context, char* cause) static void mqtt_message_cb(char* topic, char* payload, size_t length) { // Handle incoming commands from MQTT if(length + 1 >= MQTT_MAX_PACKET_SIZE) { - LOG_ERROR(TAG_MQTT_RCV, F(D_MQTT_PAYLOAD_TOO_LONG), length); + LOG_ERROR(TAG_MQTT_RCV, F(D_MQTT_PAYLOAD_TOO_LONG), (uint32_t)length); return; } else { payload[length] = '\0'; diff --git a/src/mqtt/hasp_mqtt_pubsubclient.cpp b/src/mqtt/hasp_mqtt_pubsubclient.cpp index 0911017a..c7dc9548 100644 --- a/src/mqtt/hasp_mqtt_pubsubclient.cpp +++ b/src/mqtt/hasp_mqtt_pubsubclient.cpp @@ -156,7 +156,7 @@ int mqtt_send_discovery(const char* payload, size_t len) static void mqtt_message_cb(char* topic, byte* payload, unsigned int length) { // Handle incoming commands from MQTT if(length + 1 >= mqttClient.getBufferSize()) { - LOG_ERROR(TAG_MQTT_RCV, F(D_MQTT_PAYLOAD_TOO_LONG), length); + LOG_ERROR(TAG_MQTT_RCV, F(D_MQTT_PAYLOAD_TOO_LONG), (uint32_t)length); return; } else { payload[length] = '\0';