Skip to content

Commit f3ebe2d

Browse files
devyteme-no-dev
devyte
authored and
me-no-dev
committed
Remove warnings for unused params (me-no-dev#620)
1 parent 75acf88 commit f3ebe2d

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

‎src/AsyncEventSource.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ AsyncEventSourceMessage::~AsyncEventSourceMessage() {
124124
}
125125

126126
size_t AsyncEventSourceMessage::ack(size_t len, uint32_t time) {
127+
(void)time;
127128
// If the whole message is now acked...
128129
if(_acked + len > _len){
129130
// Return the number of extra bytes acked (they will be carried on to the next message)
@@ -161,8 +162,8 @@ AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, A
161162

162163
_client->setRxTimeout(0);
163164
_client->onError(NULL, NULL);
164-
_client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ ((AsyncEventSourceClient*)(r))->_onAck(len, time); }, this);
165-
_client->onPoll([](void *r, AsyncClient* c){ ((AsyncEventSourceClient*)(r))->_onPoll(); }, this);
165+
_client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ (void)c; ((AsyncEventSourceClient*)(r))->_onAck(len, time); }, this);
166+
_client->onPoll([](void *r, AsyncClient* c){ (void)c; ((AsyncEventSourceClient*)(r))->_onPoll(); }, this);
166167
_client->onData(NULL, NULL);
167168
_client->onTimeout([this](void *r, AsyncClient* c __attribute__((unused)), uint32_t time){ ((AsyncEventSourceClient*)(r))->_onTimeout(time); }, this);
168169
_client->onDisconnect([this](void *r, AsyncClient* c){ ((AsyncEventSourceClient*)(r))->_onDisconnect(); delete c; }, this);

‎src/AsyncWebSocket.cpp‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ AsyncWebSocketBasicMessage::~AsyncWebSocketBasicMessage() {
321321
}
322322

323323
void AsyncWebSocketBasicMessage::ack(size_t len, uint32_t time) {
324+
(void)time;
324325
_acked += len;
325326
if(_sent == _len && _acked == _ack){
326327
_status = WS_MSG_SENT;
@@ -416,6 +417,7 @@ AsyncWebSocketMultiMessage::~AsyncWebSocketMultiMessage() {
416417
}
417418

418419
void AsyncWebSocketMultiMessage::ack(size_t len, uint32_t time) {
420+
(void)time;
419421
_acked += len;
420422
if(_sent >= _len && _acked >= _ack){
421423
_status = WS_MSG_SENT;
@@ -485,12 +487,12 @@ AsyncWebSocketClient::AsyncWebSocketClient(AsyncWebServerRequest *request, Async
485487
_lastMessageTime = millis();
486488
_keepAlivePeriod = 0;
487489
_client->setRxTimeout(0);
488-
_client->onError([](void *r, AsyncClient* c, int8_t error){ ((AsyncWebSocketClient*)(r))->_onError(error); }, this);
489-
_client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ ((AsyncWebSocketClient*)(r))->_onAck(len, time); }, this);
490+
_client->onError([](void *r, AsyncClient* c, int8_t error){ (void)c; ((AsyncWebSocketClient*)(r))->_onError(error); }, this);
491+
_client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ (void)c; ((AsyncWebSocketClient*)(r))->_onAck(len, time); }, this);
490492
_client->onDisconnect([](void *r, AsyncClient* c){ ((AsyncWebSocketClient*)(r))->_onDisconnect(); delete c; }, this);
491-
_client->onTimeout([](void *r, AsyncClient* c, uint32_t time){ ((AsyncWebSocketClient*)(r))->_onTimeout(time); }, this);
492-
_client->onData([](void *r, AsyncClient* c, void *buf, size_t len){ ((AsyncWebSocketClient*)(r))->_onData(buf, len); }, this);
493-
_client->onPoll([](void *r, AsyncClient* c){ ((AsyncWebSocketClient*)(r))->_onPoll(); }, this);
493+
_client->onTimeout([](void *r, AsyncClient* c, uint32_t time){ (void)c; ((AsyncWebSocketClient*)(r))->_onTimeout(time); }, this);
494+
_client->onData([](void *r, AsyncClient* c, void *buf, size_t len){ (void)c; ((AsyncWebSocketClient*)(r))->_onData(buf, len); }, this);
495+
_client->onPoll([](void *r, AsyncClient* c){ (void)c; ((AsyncWebSocketClient*)(r))->_onPoll(); }, this);
494496
_server->_addClient(this);
495497
_server->_handleEvent(this, WS_EVT_CONNECT, request, NULL, 0);
496498
delete request;
@@ -607,6 +609,7 @@ void AsyncWebSocketClient::ping(uint8_t *data, size_t len){
607609
void AsyncWebSocketClient::_onError(int8_t){}
608610

609611
void AsyncWebSocketClient::_onTimeout(uint32_t time){
612+
(void)time;
610613
_client->close(true);
611614
}
612615

@@ -1292,6 +1295,7 @@ void AsyncWebSocketResponse::_respond(AsyncWebServerRequest *request){
12921295
}
12931296

12941297
size_t AsyncWebSocketResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
1298+
(void)time;
12951299
if(len){
12961300
new AsyncWebSocketClient(request, _server);
12971301
}

‎src/AsyncWebSocket.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ class AsyncWebSocketMessageBuffer {
9494
AsyncWebSocketMessageBuffer(const AsyncWebSocketMessageBuffer &);
9595
AsyncWebSocketMessageBuffer(AsyncWebSocketMessageBuffer &&);
9696
~AsyncWebSocketMessageBuffer();
97-
void operator ++(int i) { _count++; }
98-
void operator --(int i) { if (_count > 0) { _count--; } ; }
97+
void operator ++(int i) { (void)i; _count++; }
98+
void operator --(int i) { (void)i; if (_count > 0) { _count--; } ; }
9999
bool reserve(size_t size);
100100
void lock() { _lock = true; }
101101
void unlock() { _lock = false; }

‎src/WebRequest.cpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ AsyncWebServerRequest::AsyncWebServerRequest(AsyncWebServer* s, AsyncClient* c)
6969
, _itemIsFile(false)
7070
, _tempObject(NULL)
7171
{
72-
c->onError([](void *r, AsyncClient* c, int8_t error){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onError(error); }, this);
73-
c->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onAck(len, time); }, this);
72+
c->onError([](void *r, AsyncClient* c, int8_t error){ (void)c; AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onError(error); }, this);
73+
c->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ (void)c; AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onAck(len, time); }, this);
7474
c->onDisconnect([](void *r, AsyncClient* c){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onDisconnect(); delete c; }, this);
75-
c->onTimeout([](void *r, AsyncClient* c, uint32_t time){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onTimeout(time); }, this);
76-
c->onData([](void *r, AsyncClient* c, void *buf, size_t len){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onData(buf, len); }, this);
77-
c->onPoll([](void *r, AsyncClient* c){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onPoll(); }, this);
75+
c->onTimeout([](void *r, AsyncClient* c, uint32_t time){ (void)c; AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onTimeout(time); }, this);
76+
c->onData([](void *r, AsyncClient* c, void *buf, size_t len){ (void)c; AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onData(buf, len); }, this);
77+
c->onPoll([](void *r, AsyncClient* c){ (void)c; AsyncWebServerRequest *req = ( AsyncWebServerRequest*)r; req->_onPoll(); }, this);
7878
}
7979

8080
AsyncWebServerRequest::~AsyncWebServerRequest(){
@@ -208,10 +208,11 @@ void AsyncWebServerRequest::_onAck(size_t len, uint32_t time){
208208
}
209209

210210
void AsyncWebServerRequest::_onError(int8_t error){
211-
211+
(void)error;
212212
}
213213

214214
void AsyncWebServerRequest::_onTimeout(uint32_t time){
215+
(void)time;
215216
//os_printf("TIMEOUT: %u, state: %s\n", time, _client->stateToString());
216217
_client->close();
217218
}

‎src/WebResponses.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ bool AsyncWebServerResponse::_finished() const { return _state > RESPONSE_WAIT_A
161161
bool AsyncWebServerResponse::_failed() const { return _state == RESPONSE_FAILED; }
162162
bool AsyncWebServerResponse::_sourceValid() const { return false; }
163163
void AsyncWebServerResponse::_respond(AsyncWebServerRequest *request){ _state = RESPONSE_END; request->client()->close(); }
164-
size_t AsyncWebServerResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){ return 0; }
164+
size_t AsyncWebServerResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){ (void)request; (void)len; (void)time; return 0; }
165165

166166
/*
167167
* String/Code Response
@@ -213,6 +213,7 @@ void AsyncBasicResponse::_respond(AsyncWebServerRequest *request){
213213
}
214214

215215
size_t AsyncBasicResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
216+
(void)time;
216217
_ackedLength += len;
217218
if(_state == RESPONSE_CONTENT){
218219
size_t available = _contentLength - _sentLength;
@@ -261,6 +262,7 @@ void AsyncAbstractResponse::_respond(AsyncWebServerRequest *request){
261262
}
262263

263264
size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
265+
(void)time;
264266
if(!_sourceValid()){
265267
_state = RESPONSE_FAILED;
266268
request->client()->close();

0 commit comments

Comments
 (0)