Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 04d998d

Browse files
authored
Merge pull request #404 from pennam/wifis3-warnings
 Reduce WiFiS3 warnings
2 parents 8bb82e1 + 75bbb30 commit 04d998d

File tree

7 files changed

+12
-9
lines changed

7 files changed

+12
-9
lines changed

‎libraries/WiFiS3/src/Modem.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ bool ModemClass::passthrough(const uint8_t *data, size_t size) {
7575
/* -------------------------------------------------------------------------- */
7676
void ModemClass::write_nowait(const string &cmd, string &str, const char * fmt, ...) {
7777
/* -------------------------------------------------------------------------- */
78+
(void)cmd;
79+
(void)str;
80+
7881
va_list va;
7982
va_start (va, fmt);
8083
vsnprintf((char *)tx_buff, MAX_BUFF_SIZE, fmt, va);
@@ -318,6 +321,7 @@ ModemClass::ParseResult ModemClass::buf_read(const string &prompt, string &data_
318321
if(c == '\n') {
319322
state = at_parse_state_t::Res;
320323
}
324+
/* fall through */
321325

322326
/*
323327
* break is volountary not present, to cover for cases where the response status is in the

‎libraries/WiFiS3/src/WiFi.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ const char* CWifi::firmwareVersion() {
2525
/* -------------------------------------------------------------------------- */
2626
uint32_t CWifi::firmwareVersionU32() {
2727
/* -------------------------------------------------------------------------- */
28-
uint8_t ret[4];
2928
string res = "";
3029
modem.begin();
3130
if(modem.write(string(PROMPT(_FWVERSION_U32)), res, CMD_READ(_FWVERSION_U32))) {

‎libraries/WiFiS3/src/WiFiClient.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ int WiFiClient::_read() {
128128

129129
if(modem.write(string(PROMPT(_CLIENTRECEIVE)),res, "%s%d,%d\r\n" , CMD_WRITE(_CLIENTRECEIVE), _sock, size)) {
130130
if(res.size() > 0) {
131-
for(int i = 0, rv = 0; i < size && i < res.size(); i++) {
131+
for(uint32_t i = 0, rv = 0; i < size && i < res.size(); i++) {
132132
rx_buffer->store((uint8_t)res[i]);
133133
rv++;
134134
}
@@ -168,7 +168,7 @@ int WiFiClient::read(uint8_t *buf, size_t size) {
168168
int rv = 0;
169169
bool go_on = true;
170170
if(_sock >= 0 && rx_buffer != nullptr) {
171-
for(int i = 0; i < size && go_on; i++) {
171+
for(size_t i = 0; i < size && go_on; i++) {
172172
bool is_read = false;
173173
*(buf+i) = rx_buffer->read(&is_read);
174174
if(is_read) {

‎libraries/WiFiS3/src/WiFiClient.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,13 @@ class WiFiClient : public Client {
7070

7171
protected:
7272
int _sock;
73+
bool destroy_at_distructor;
7374
int _connectionTimeout = 0;
7475
void getSocket();
7576
static constexpr uint32_t RX_BUFFER_DIM = 1024;
7677
std::shared_ptr<FifoBuffer<uint8_t,RX_BUFFER_DIM>> rx_buffer;
7778
int _read();
7879
void read_if_needed(size_t s);
79-
bool destroy_at_distructor;
80-
8180

8281
};
8382

‎libraries/WiFiS3/src/WiFiFileSystem.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ size_t WiFiFileSystem::writefile(const char* name, const char* data, size_t size
2020
if(modem.passthrough((uint8_t *)data, size)) {
2121
return size;
2222
}
23+
return 0;
2324
}
2425

2526
/* -------------------------------------------------------------------------- */

‎libraries/WiFiS3/src/WiFiSSLClient.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ int WiFiSSLClient::_read() {
148148
modem.read_using_size();
149149
if(modem.write(string(PROMPT(_SSLCLIENTRECEIVE)),res, "%s%d,%d\r\n" , CMD_WRITE(_SSLCLIENTRECEIVE), _sock, size)) {
150150
if(res.size() > 0) {
151-
for(int i = 0, rv = 0; i < size && i < res.size(); i++) {
151+
for(uint32_t i = 0, rv = 0; i < size && i < res.size(); i++) {
152152
rx_buffer->store((uint8_t)res[i]);
153153
rv++;
154154
}
@@ -185,7 +185,7 @@ int WiFiSSLClient::read(uint8_t *buf, size_t size) {
185185
read_if_needed(size);
186186
int rv = 0;
187187
bool go_on = true;
188-
for(int i = 0; i < size && go_on; i++) {
188+
for(size_t i = 0; i < size && go_on; i++) {
189189
bool is_read = false;
190190
*(buf+i) = rx_buffer->read(&is_read);
191191
if(is_read) {

‎libraries/WiFiS3/src/WiFiUdp.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ int WiFiUDP::_read() {
181181
modem.read_using_size();
182182
if(modem.write(string(PROMPT(_UDPREAD)),res, "%s%d,%d\r\n" , CMD_WRITE(_UDPREAD), _sock, size)) {
183183
if(res.size() > 0) {
184-
for(int i = 0, rv = 0; i < size && i < res.size(); i++) {
184+
for(uint32_t i = 0, rv = 0; i < size && i < res.size(); i++) {
185185
rx_buffer.store((uint8_t)res[i]);
186186
rv++;
187187
}
@@ -218,7 +218,7 @@ int WiFiUDP::read(unsigned char* buf, size_t size) {
218218
read_if_needed(size);
219219
int rv = 0;
220220
bool go_on = true;
221-
for(int i = 0; i < size && go_on; i++) {
221+
for(size_t i = 0; i < size && go_on; i++) {
222222
bool is_read = false;
223223
*(buf+i) = rx_buffer.read(&is_read);
224224
if(is_read) {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /