From 05bee3294a43d9980ac5cdd28c1bd7652b686440 Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Thu, 5 Sep 2019 12:03:00 -0400 Subject: [PATCH] some extra casting around size_t --- src/TinyGsmClientA6.h | 2 +- src/TinyGsmClientBG96.h | 6 +++--- src/TinyGsmClientESP8266.h | 4 ++-- src/TinyGsmClientM590.h | 2 +- src/TinyGsmClientM95.h | 8 ++++---- src/TinyGsmClientMC60.h | 8 ++++---- src/TinyGsmClientSIM5360.h | 10 +++++----- src/TinyGsmClientSIM7000.h | 10 +++++----- src/TinyGsmClientSIM7600.h | 10 +++++----- src/TinyGsmClientSIM800.h | 10 +++++----- src/TinyGsmClientSequansMonarch.h | 6 +++--- src/TinyGsmClientUBLOX.h | 6 +++--- 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h index fa22c5e..449d330 100644 --- a/src/TinyGsmClientA6.h +++ b/src/TinyGsmClientA6.h @@ -581,7 +581,7 @@ protected: } int16_t modemSend(const void* buff, size_t len, uint8_t mux) { - sendAT(GF("+CIPSEND="), mux, ',', len); + sendAT(GF("+CIPSEND="), mux, ',', (uint16_t)len); if (waitResponse(2000L, GF(GSM_NL ">")) != 1) { return 0; } diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h index 521e5db..1335667 100644 --- a/src/TinyGsmClientBG96.h +++ b/src/TinyGsmClientBG96.h @@ -536,7 +536,7 @@ protected: } int16_t modemSend(const void* buff, size_t len, uint8_t mux) { - sendAT(GF("+QISEND="), mux, ',', len); + sendAT(GF("+QISEND="), mux, ',', (uint16_t)len); if (waitResponse(GF(">")) != 1) { return 0; } @@ -550,11 +550,11 @@ protected: } size_t modemRead(size_t size, uint8_t mux) { - sendAT(GF("+QIRD="), mux, ',', size); + sendAT(GF("+QIRD="), mux, ',', (uint16_t)size); if (waitResponse(GF("+QIRD:")) != 1) { return 0; } - size_t len = stream.readStringUntil('\n').toInt(); + int len = stream.readStringUntil('\n').toInt(); for (size_t i=0; i")) != 1) { return 0; } @@ -403,7 +403,7 @@ protected: for (int muxNo = 0; muxNo < TINY_GSM_MUX_COUNT; muxNo++) { uint8_t has_status = waitResponse(GF("+CIPSTATUS:"), GFP(GSM_OK), GFP(GSM_ERROR)); if (has_status == 1) { - size_t returned_mux = stream.readStringUntil(',').toInt(); + int returned_mux = stream.readStringUntil(',').toInt(); streamSkipUntil(','); // Skip mux streamSkipUntil(','); // Skip type streamSkipUntil(','); // Skip remote IP diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h index 91d0bde..f312e59 100644 --- a/src/TinyGsmClientM590.h +++ b/src/TinyGsmClientM590.h @@ -459,7 +459,7 @@ protected: } int16_t modemSend(const void* buff, size_t len, uint8_t mux) { - sendAT(GF("+TCPSEND="), mux, ',', len); + sendAT(GF("+TCPSEND="), mux, ',', (uint16_t)len); if (waitResponse(GF(">")) != 1) { return 0; } diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h index 05367ac..faa9747 100644 --- a/src/TinyGsmClientM95.h +++ b/src/TinyGsmClientM95.h @@ -599,7 +599,7 @@ protected: } int16_t modemSend(const void* buff, size_t len, uint8_t mux) { - sendAT(GF("+QISEND="), mux, ',', len); + sendAT(GF("+QISEND="), mux, ',', (uint16_t)len); if (waitResponse(GF(">")) != 1) { return 0; } @@ -636,15 +636,15 @@ protected: // sc = role in connection = 1, client of connection // sid = index of connection = mux // len = maximum length of data to retrieve - sendAT(GF("+QIRD=0,1,"), mux, ',', size); - // sendAT(GF("+QIRD="), mux, ',', size); + sendAT(GF("+QIRD=0,1,"), mux, ',', (uint16_t)size); + // sendAT(GF("+QIRD="), mux, ',', (uint16_t)size); if (waitResponse(GF("+QIRD:")) != 1) { return 0; } streamSkipUntil(':'); // skip IP address streamSkipUntil(','); // skip port streamSkipUntil(','); // skip connection type (TCP/UDP) - size_t len = stream.readStringUntil('\n').toInt(); // read length + int len = stream.readStringUntil('\n').toInt(); // read length for (size_t i=0; isock_available--; diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h index c294d20..ce23b76 100644 --- a/src/TinyGsmClientMC60.h +++ b/src/TinyGsmClientMC60.h @@ -598,7 +598,7 @@ protected: } int16_t modemSend(const void* buff, size_t len, uint8_t mux) { - sendAT(GF("+QISEND="), mux, ',', len); + sendAT(GF("+QISEND="), mux, ',', (uint16_t)len); if (waitResponse(GF(">")) != 1) { return 0; } @@ -637,15 +637,15 @@ protected: // sc = roll in connection - 1, client of connection // sid = index of connection - mux // len = maximum length of data to send - sendAT(GF("+QIRD=0,1,"), mux, ',', size); - // sendAT(GF("+QIRD="), mux, ',', size); + sendAT(GF("+QIRD=0,1,"), mux, ',', (uint16_t)size); + // sendAT(GF("+QIRD="), mux, ',', (uint16_t)size); if (waitResponse(GF("+QIRD:")) != 1) { return 0; } streamSkipUntil(':'); // skip IP address streamSkipUntil(','); // skip port streamSkipUntil(','); // skip connection type (TCP/UDP) - size_t len = stream.readStringUntil('\n').toInt(); // read length + int len = stream.readStringUntil('\n').toInt(); // read length for (size_t i=0; isock_available--; diff --git a/src/TinyGsmClientSIM5360.h b/src/TinyGsmClientSIM5360.h index e97df2c..8d27f75 100644 --- a/src/TinyGsmClientSIM5360.h +++ b/src/TinyGsmClientSIM5360.h @@ -673,7 +673,7 @@ protected: } int16_t modemSend(const void* buff, size_t len, uint8_t mux) { - sendAT(GF("+CIPSEND="), mux, ',', len); + sendAT(GF("+CIPSEND="), mux, ',', (uint16_t)len); if (waitResponse(GF(">")) != 1) { return 0; } @@ -690,21 +690,21 @@ protected: size_t modemRead(size_t size, uint8_t mux) { #ifdef TINY_GSM_USE_HEX - sendAT(GF("+CIPRXGET=3,"), mux, ',', size); + sendAT(GF("+CIPRXGET=3,"), mux, ',', (uint16_t)size); if (waitResponse(GF("+CIPRXGET:")) != 1) { return 0; } #else - sendAT(GF("+CIPRXGET=2,"), mux, ',', size); + sendAT(GF("+CIPRXGET=2,"), mux, ',', (uint16_t)size); if (waitResponse(GF("+CIPRXGET:")) != 1) { return 0; } #endif streamSkipUntil(','); // Skip Rx mode 2/normal or 3/HEX streamSkipUntil(','); // Skip mux/cid (connecion id) - size_t len_requested = stream.readStringUntil(',').toInt(); + int len_requested = stream.readStringUntil(',').toInt(); // ^^ Requested number of data bytes (1-1460 bytes)to be read - size_t len_confirmed = stream.readStringUntil('\n').toInt(); + int len_confirmed = stream.readStringUntil('\n').toInt(); // ^^ The data length which not read in the buffer for (size_t i=0; i")) != 1) { return 0; } @@ -847,21 +847,21 @@ protected: size_t modemRead(size_t size, uint8_t mux) { #ifdef TINY_GSM_USE_HEX - sendAT(GF("+CIPRXGET=3,"), mux, ',', size); + sendAT(GF("+CIPRXGET=3,"), mux, ',', (uint16_t)size); if (waitResponse(GF("+CIPRXGET:")) != 1) { return 0; } #else - sendAT(GF("+CIPRXGET=2,"), mux, ',', size); + sendAT(GF("+CIPRXGET=2,"), mux, ',', (uint16_t)size); if (waitResponse(GF("+CIPRXGET:")) != 1) { return 0; } #endif streamSkipUntil(','); // Skip Rx mode 2/normal or 3/HEX streamSkipUntil(','); // Skip mux - size_t len_requested = stream.readStringUntil(',').toInt(); + int len_requested = stream.readStringUntil(',').toInt(); // ^^ Requested number of data bytes (1-1460 bytes)to be read - size_t len_confirmed = stream.readStringUntil('\n').toInt(); + int len_confirmed = stream.readStringUntil('\n').toInt(); // ^^ Confirmed number of data bytes to be read, which may be less than requested. // 0 indicates that no data can be read. // This is actually be the number of bytes that will be remaining after the read diff --git a/src/TinyGsmClientSIM7600.h b/src/TinyGsmClientSIM7600.h index 649c6dc..00f6d04 100644 --- a/src/TinyGsmClientSIM7600.h +++ b/src/TinyGsmClientSIM7600.h @@ -679,7 +679,7 @@ protected: } int16_t modemSend(const void* buff, size_t len, uint8_t mux) { - sendAT(GF("+CIPSEND="), mux, ',', len); + sendAT(GF("+CIPSEND="), mux, ',', (uint16_t)len); if (waitResponse(GF(">")) != 1) { return 0; } @@ -696,21 +696,21 @@ protected: size_t modemRead(size_t size, uint8_t mux) { #ifdef TINY_GSM_USE_HEX - sendAT(GF("+CIPRXGET=3,"), mux, ',', size); + sendAT(GF("+CIPRXGET=3,"), mux, ',', (uint16_t)size); if (waitResponse(GF("+CIPRXGET:")) != 1) { return 0; } #else - sendAT(GF("+CIPRXGET=2,"), mux, ',', size); + sendAT(GF("+CIPRXGET=2,"), mux, ',', (uint16_t)size); if (waitResponse(GF("+CIPRXGET:")) != 1) { return 0; } #endif streamSkipUntil(','); // Skip Rx mode 2/normal or 3/HEX streamSkipUntil(','); // Skip mux/cid (connecion id) - size_t len_requested = stream.readStringUntil(',').toInt(); + int len_requested = stream.readStringUntil(',').toInt(); // ^^ Requested number of data bytes (1-1460 bytes)to be read - size_t len_confirmed = stream.readStringUntil('\n').toInt(); + int len_confirmed = stream.readStringUntil('\n').toInt(); // ^^ The data length which not read in the buffer for (size_t i=0; i")) != 1) { return 0; } @@ -827,21 +827,21 @@ protected: size_t modemRead(size_t size, uint8_t mux) { #ifdef TINY_GSM_USE_HEX - sendAT(GF("+CIPRXGET=3,"), mux, ',', size); + sendAT(GF("+CIPRXGET=3,"), mux, ',', (uint16_t)size); if (waitResponse(GF("+CIPRXGET:")) != 1) { return 0; } #else - sendAT(GF("+CIPRXGET=2,"), mux, ',', size); + sendAT(GF("+CIPRXGET=2,"), mux, ',', (uint16_t)size); if (waitResponse(GF("+CIPRXGET:")) != 1) { return 0; } #endif streamSkipUntil(','); // Skip Rx mode 2/normal or 3/HEX streamSkipUntil(','); // Skip mux - size_t len_requested = stream.readStringUntil(',').toInt(); + int len_requested = stream.readStringUntil(',').toInt(); // ^^ Requested number of data bytes (1-1460 bytes)to be read - size_t len_confirmed = stream.readStringUntil('\n').toInt(); + int len_confirmed = stream.readStringUntil('\n').toInt(); // ^^ Confirmed number of data bytes to be read, which may be less than requested. // 0 indicates that no data can be read. // This is actually be the number of bytes that will be remaining after the read diff --git a/src/TinyGsmClientSequansMonarch.h b/src/TinyGsmClientSequansMonarch.h index efc6c27..433a6a2 100644 --- a/src/TinyGsmClientSequansMonarch.h +++ b/src/TinyGsmClientSequansMonarch.h @@ -584,7 +584,7 @@ protected: return 0; } - sendAT(GF("+SQNSSENDEXT="), mux, ',', len); + sendAT(GF("+SQNSSENDEXT="), mux, ',', (uint16_t)len); waitResponse(10000L, GF(GSM_NL "> ")); stream.write((uint8_t*)buff, len); stream.flush(); @@ -619,12 +619,12 @@ protected: size_t modemRead(size_t size, uint8_t mux) { - sendAT(GF("+SQNSRECV="), mux, ',', size); + sendAT(GF("+SQNSRECV="), mux, ',', (uint16_t)size); if (waitResponse(GF("+SQNSRECV: ")) != 1) { return 0; } streamSkipUntil(','); // Skip mux - size_t len = stream.readStringUntil('\n').toInt(); + int len = stream.readStringUntil('\n').toInt(); for (size_t i=0; i_timeout)) { TINY_GSM_YIELD(); } \ diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h index df49ffe..579364b 100644 --- a/src/TinyGsmClientUBLOX.h +++ b/src/TinyGsmClientUBLOX.h @@ -583,7 +583,7 @@ protected: } int16_t modemSend(const void* buff, size_t len, uint8_t mux) { - sendAT(GF("+USOWR="), mux, ',', len); + sendAT(GF("+USOWR="), mux, ',', (uint16_t)len); if (waitResponse(GF("@")) != 1) { return 0; } @@ -601,12 +601,12 @@ protected: } size_t modemRead(size_t size, uint8_t mux) { - sendAT(GF("+USORD="), mux, ',', size); + sendAT(GF("+USORD="), mux, ',', (uint16_t)size); if (waitResponse(GF(GSM_NL "+USORD:")) != 1) { return 0; } streamSkipUntil(','); // Skip mux - size_t len = stream.readStringUntil(',').toInt(); + int len = stream.readStringUntil(',').toInt(); streamSkipUntil('\"'); for (size_t i=0; i