Skip to content

Commit 56af54d

Browse files
ci(pre-commit): Apply automatic fixes
1 parent 2202b2e commit 56af54d

File tree

6 files changed

+28
-27
lines changed

6 files changed

+28
-27
lines changed

src/AsyncEventSource.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,16 +487,17 @@ void AsyncEventSourceResponse::_respond(AsyncWebServerRequest *request) {
487487
_request = request;
488488
request->client()->onAck(
489489
[](void *r, AsyncClient *c, size_t len, uint32_t time) {
490-
if (len)
491-
static_cast<AsyncEventSourceResponse*>(r)->_switchClient();
490+
if (len) {
491+
static_cast<AsyncEventSourceResponse *>(r)->_switchClient();
492+
}
492493
},
493494
this
494495
);
495496
request->client()->write(out.c_str(), _headLength);
496497
_state = RESPONSE_WAIT_ACK;
497498
}
498499

499-
void AsyncEventSourceResponse::_switchClient(){
500+
void AsyncEventSourceResponse::_switchClient() {
500501
// AsyncEventSourceClient c-tor will take the ownership of AsyncTCP's client connection
501502
new AsyncEventSourceClient(_request, _server);
502503
// AsyncEventSourceClient c-tor would also delete _request and *this

src/AsyncEventSource.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ class AsyncEventSourceClient {
144144
/**
145145
* @brief Construct a new Async Event Source Client object
146146
* @note constructor would take the ownership of of AsyncTCP's client pointer from `request` parameter and call delete on it!
147-
*
148-
* @param request
149-
* @param server
147+
*
148+
* @param request
149+
* @param server
150150
*/
151151
AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server);
152152
~AsyncEventSourceClient();
@@ -326,7 +326,9 @@ class AsyncEventSourceResponse : public AsyncWebServerResponse {
326326
public:
327327
AsyncEventSourceResponse(AsyncEventSource *server);
328328
void _respond(AsyncWebServerRequest *request);
329-
size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time) override { return 0; };
329+
size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time) override {
330+
return 0;
331+
};
330332
bool _sourceValid() const {
331333
return true;
332334
}

src/AsyncWebSocket.cpp

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,7 @@ const char *AWSC_PING_PAYLOAD = "ESPAsyncWebServer-PING";
222222
const size_t AWSC_PING_PAYLOAD_LEN = 22;
223223

224224
AsyncWebSocketClient::AsyncWebSocketClient(AsyncClient *client, AsyncWebSocket *server)
225-
: _client(client),
226-
_server(server),
227-
_clientId(_server->_getNextId()),
228-
_status(WS_CONNECTED),
229-
_pstate(0),
230-
_lastMessageTime(millis()),
231-
_keepAlivePeriod(0),
225+
: _client(client), _server(server), _clientId(_server->_getNextId()), _status(WS_CONNECTED), _pstate(0), _lastMessageTime(millis()), _keepAlivePeriod(0),
232226
_tempObject(NULL) {
233227

234228
_client->setRxTimeout(0);
@@ -1298,8 +1292,9 @@ void AsyncWebSocketResponse::_respond(AsyncWebServerRequest *request) {
12981292
_request = request;
12991293
request->client()->onAck(
13001294
[](void *r, AsyncClient *c, size_t len, uint32_t time) {
1301-
if (len)
1302-
static_cast<AsyncWebSocketResponse*>(r)->_switchClient();
1295+
if (len) {
1296+
static_cast<AsyncWebSocketResponse *>(r)->_switchClient();
1297+
}
13031298
},
13041299
this
13051300
);
@@ -1309,8 +1304,8 @@ void AsyncWebSocketResponse::_respond(AsyncWebServerRequest *request) {
13091304
_state = RESPONSE_WAIT_ACK;
13101305
}
13111306

1312-
void AsyncWebSocketResponse::_switchClient(){
1307+
void AsyncWebSocketResponse::_switchClient() {
13131308
// detach client from request
13141309
_server->_newClient(_request);
13151310
// _newClient() would also destruct _request and *this
1316-
}
1311+
}

src/AsyncWebSocket.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ class AsyncWebSocketClient {
223223

224224
AwsFrameInfo _pinfo;
225225

226-
227226
bool _queueControl(uint8_t opcode, const uint8_t *data = NULL, size_t len = 0, bool mask = false);
228227
bool _queueMessage(AsyncWebSocketSharedBuffer buffer, uint8_t opcode = WS_TEXT, bool mask = false);
229228
void _runQueue();
@@ -237,10 +236,12 @@ class AsyncWebSocketClient {
237236
/**
238237
* @brief Construct a new Async Web Socket Client object
239238
* @note constructor would take the ownership of of AsyncTCP's client pointer from `request` parameter and call delete on it!
240-
* @param request
241-
* @param server
239+
* @param request
240+
* @param server
242241
*/
243-
AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server) : AsyncWebSocketClient(request->clientRelease(), server) { delete request; };
242+
AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server) : AsyncWebSocketClient(request->clientRelease(), server) {
243+
delete request;
244+
};
244245
~AsyncWebSocketClient();
245246

246247
// client id increments for the given server
@@ -479,7 +480,9 @@ class AsyncWebSocketResponse : public AsyncWebServerResponse {
479480
public:
480481
AsyncWebSocketResponse(const String &key, AsyncWebSocket *server);
481482
void _respond(AsyncWebServerRequest *request);
482-
size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time) override { return 0; };
483+
size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time) override {
484+
return 0;
485+
};
483486
bool _sourceValid() const {
484487
return true;
485488
}

src/ESPAsyncWebServer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,10 @@ class AsyncWebServerRequest {
313313
* could be used for long lived connection like SSE or WebSockets
314314
* @note do not call this methos unless you know what you are doing, otherwise it may lead to
315315
* memory leaks and connections lingering
316-
*
316+
*
317317
* @return AsyncClient* pointer to released connection object
318318
*/
319-
AsyncClient* clientRelease();
319+
AsyncClient *clientRelease();
320320

321321
uint8_t version() const {
322322
return _version;

src/WebRequest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,8 +1154,8 @@ bool AsyncWebServerRequest::isExpectedRequestedConnType(RequestedConnectionType
11541154
|| ((erct3 != RCT_NOT_USED) && (erct3 == _reqconntype));
11551155
}
11561156

1157-
AsyncClient* AsyncWebServerRequest::clientRelease(){
1158-
AsyncClient* c = _client;
1157+
AsyncClient *AsyncWebServerRequest::clientRelease() {
1158+
AsyncClient *c = _client;
11591159
_client = nullptr;
11601160
return c;
11611161
}

0 commit comments

Comments
 (0)