From 983e92b023985825a4fa93523ff3110c339333d4 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 28 Nov 2024 11:10:43 +0100 Subject: [PATCH 1/8] WiFiUdp: fix Wsign-compare --- libraries/WiFiS3/src/WiFiUdp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/WiFiS3/src/WiFiUdp.cpp b/libraries/WiFiS3/src/WiFiUdp.cpp index 5337c8360..f229485c6 100644 --- a/libraries/WiFiS3/src/WiFiUdp.cpp +++ b/libraries/WiFiS3/src/WiFiUdp.cpp @@ -181,7 +181,7 @@ int WiFiUDP::_read() { modem.read_using_size(); if(modem.write(string(PROMPT(_UDPREAD)),res, "%s%d,%d\r\n" , CMD_WRITE(_UDPREAD), _sock, size)) { if(res.size() > 0) { - for(int i = 0, rv = 0; i < size && i < res.size(); i++) { + for(uint32_t i = 0, rv = 0; i < size && i < res.size(); i++) { rx_buffer.store((uint8_t)res[i]); rv++; } @@ -218,7 +218,7 @@ int WiFiUDP::read(unsigned char* buf, size_t size) { read_if_needed(size); int rv = 0; bool go_on = true; - for(int i = 0; i < size && go_on; i++) { + for(size_t i = 0; i < size && go_on; i++) { bool is_read = false; *(buf+i) = rx_buffer.read(&is_read); if(is_read) { From 1b2737375321636d4a2847a7a02d967db3e6a60f Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 28 Nov 2024 11:11:16 +0100 Subject: [PATCH 2/8] WiFiSSLClient: fix Wsign-compare --- libraries/WiFiS3/src/WiFiSSLClient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/WiFiS3/src/WiFiSSLClient.cpp b/libraries/WiFiS3/src/WiFiSSLClient.cpp index 91b6951e5..bfe7c488d 100644 --- a/libraries/WiFiS3/src/WiFiSSLClient.cpp +++ b/libraries/WiFiS3/src/WiFiSSLClient.cpp @@ -148,7 +148,7 @@ int WiFiSSLClient::_read() { modem.read_using_size(); if(modem.write(string(PROMPT(_SSLCLIENTRECEIVE)),res, "%s%d,%d\r\n" , CMD_WRITE(_SSLCLIENTRECEIVE), _sock, size)) { if(res.size() > 0) { - for(int i = 0, rv = 0; i < size && i < res.size(); i++) { + for(uint32_t i = 0, rv = 0; i < size && i < res.size(); i++) { rx_buffer->store((uint8_t)res[i]); rv++; } @@ -185,7 +185,7 @@ int WiFiSSLClient::read(uint8_t *buf, size_t size) { read_if_needed(size); int rv = 0; bool go_on = true; - for(int i = 0; i < size && go_on; i++) { + for(size_t i = 0; i < size && go_on; i++) { bool is_read = false; *(buf+i) = rx_buffer->read(&is_read); if(is_read) { From ba39680e53755c1859847f25961efe25564d5362 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 28 Nov 2024 11:11:43 +0100 Subject: [PATCH 3/8] WiFiFileSystem: add missing return value --- libraries/WiFiS3/src/WiFiFileSystem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/WiFiS3/src/WiFiFileSystem.cpp b/libraries/WiFiS3/src/WiFiFileSystem.cpp index 938f2d8b5..8dc7fa8b5 100644 --- a/libraries/WiFiS3/src/WiFiFileSystem.cpp +++ b/libraries/WiFiS3/src/WiFiFileSystem.cpp @@ -20,6 +20,7 @@ size_t WiFiFileSystem::writefile(const char* name, const char* data, size_t size if(modem.passthrough((uint8_t *)data, size)) { return size; } + return 0; } /* -------------------------------------------------------------------------- */ From 9172976f70ff2c47c44a603f7d32a6732d0d4bb2 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 28 Nov 2024 11:12:14 +0100 Subject: [PATCH 4/8] WiFiClient: fix Wreorder --- libraries/WiFiS3/src/WiFiClient.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/WiFiS3/src/WiFiClient.h b/libraries/WiFiS3/src/WiFiClient.h index 81f5afae6..63b019c32 100644 --- a/libraries/WiFiS3/src/WiFiClient.h +++ b/libraries/WiFiS3/src/WiFiClient.h @@ -70,14 +70,13 @@ class WiFiClient : public Client { protected: int _sock; + bool destroy_at_distructor; int _connectionTimeout = 0; void getSocket(); static constexpr uint32_t RX_BUFFER_DIM = 1024; std::shared_ptr> rx_buffer; int _read(); void read_if_needed(size_t s); - bool destroy_at_distructor; - }; From 0a0e7a4bf884457268bb27f340f0daf9eea7fd13 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 28 Nov 2024 11:12:44 +0100 Subject: [PATCH 5/8] WiFiClient: fix Wsign-compare --- libraries/WiFiS3/src/WiFiClient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/WiFiS3/src/WiFiClient.cpp b/libraries/WiFiS3/src/WiFiClient.cpp index 143f92dae..9e6d09261 100644 --- a/libraries/WiFiS3/src/WiFiClient.cpp +++ b/libraries/WiFiS3/src/WiFiClient.cpp @@ -128,7 +128,7 @@ int WiFiClient::_read() { if(modem.write(string(PROMPT(_CLIENTRECEIVE)),res, "%s%d,%d\r\n" , CMD_WRITE(_CLIENTRECEIVE), _sock, size)) { if(res.size() > 0) { - for(int i = 0, rv = 0; i < size && i < res.size(); i++) { + for(uint32_t i = 0, rv = 0; i < size && i < res.size(); i++) { rx_buffer->store((uint8_t)res[i]); rv++; } @@ -168,7 +168,7 @@ int WiFiClient::read(uint8_t *buf, size_t size) { int rv = 0; bool go_on = true; if(_sock >= 0 && rx_buffer != nullptr) { - for(int i = 0; i < size && go_on; i++) { + for(size_t i = 0; i < size && go_on; i++) { bool is_read = false; *(buf+i) = rx_buffer->read(&is_read); if(is_read) { From 118cdb034076a1870959ee6408e1f356b83c2043 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 28 Nov 2024 11:13:07 +0100 Subject: [PATCH 6/8] WiFi: remove unused variable --- libraries/WiFiS3/src/WiFi.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/WiFiS3/src/WiFi.cpp b/libraries/WiFiS3/src/WiFi.cpp index a43d32d57..db95761b5 100644 --- a/libraries/WiFiS3/src/WiFi.cpp +++ b/libraries/WiFiS3/src/WiFi.cpp @@ -25,7 +25,6 @@ const char* CWifi::firmwareVersion() { /* -------------------------------------------------------------------------- */ uint32_t CWifi::firmwareVersionU32() { /* -------------------------------------------------------------------------- */ - uint8_t ret[4]; string res = ""; modem.begin(); if(modem.write(string(PROMPT(_FWVERSION_U32)), res, CMD_READ(_FWVERSION_U32))) { From 6bac645efe2c6a7b1801f138caf6f4274ca6165c Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 28 Nov 2024 11:14:42 +0100 Subject: [PATCH 7/8] Modem: suppress Wunused-parameter --- libraries/WiFiS3/src/Modem.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/WiFiS3/src/Modem.cpp b/libraries/WiFiS3/src/Modem.cpp index c1dba332f..1312c224a 100644 --- a/libraries/WiFiS3/src/Modem.cpp +++ b/libraries/WiFiS3/src/Modem.cpp @@ -75,6 +75,9 @@ bool ModemClass::passthrough(const uint8_t *data, size_t size) { /* -------------------------------------------------------------------------- */ void ModemClass::write_nowait(const string &cmd, string &str, const char * fmt, ...) { /* -------------------------------------------------------------------------- */ + (void)cmd; + (void)str; + va_list va; va_start (va, fmt); vsnprintf((char *)tx_buff, MAX_BUFF_SIZE, fmt, va); From 75bbb30036c4358b298875f2b059e9c37a0e8ae0 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 28 Nov 2024 11:15:34 +0100 Subject: [PATCH 8/8] Modem: add explicit fall through --- libraries/WiFiS3/src/Modem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/WiFiS3/src/Modem.cpp b/libraries/WiFiS3/src/Modem.cpp index 1312c224a..7aa34391a 100644 --- a/libraries/WiFiS3/src/Modem.cpp +++ b/libraries/WiFiS3/src/Modem.cpp @@ -321,6 +321,7 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_ if(c == '\n') { state = at_parse_state_t::Res; } + /* fall through */ /* * break is volountary not present, to cover for cases where the response status is in the