Skip to content

Commit 6eee4c6

Browse files
Links2004Links2004
committed
clang-format
1 parent a804e8e commit 6eee4c6

File tree

7 files changed

+66
-66
lines changed

7 files changed

+66
-66
lines changed

‎src/WebSockets.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ extern "C" {
4242
#include <esp_system.h>
4343

4444
#if ESP_IDF_VERSION_MAJOR >= 4
45-
#if(ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(1, 0, 6))
45+
#if (ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(1, 0, 6))
4646
#include "sha/sha_parallel_engine.h"
4747
#else
4848
#include <esp32/sha.h>
@@ -328,7 +328,7 @@ void WebSockets::headerDone(WSclient_t * client) {
328328
client->status = WSC_CONNECTED;
329329
client->cWsRXsize = 0;
330330
DEBUG_WEBSOCKETS("[WS][%d][headerDone] Header Handling Done.\n", client->num);
331-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
331+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
332332
client->cHttpLine = "";
333333
handleWebsocket(client);
334334
#endif
@@ -525,7 +525,7 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t
525525

526526
// reset input
527527
client->cWsRXsize = 0;
528-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
528+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
529529
// register callback for next message
530530
handleWebsocketWaitFor(client, 2);
531531
#endif
@@ -594,7 +594,7 @@ String WebSockets::base64_encode(uint8_t * data, size_t length) {
594594
* @return true if ok
595595
*/
596596
bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWaitCb cb) {
597-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
597+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
598598
if(!client->tcp || !client->tcp->connected()) {
599599
return false;
600600
}

‎src/WebSockets.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
#endif
171171

172172
// Includes and defined based on Network Type
173-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
173+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
174174

175175
// Note:
176176
// No SSL/WSS support for client in Async mode
@@ -193,7 +193,7 @@
193193
#define WEBSOCKETS_NETWORK_CLASS AsyncTCPbuffer
194194
#define WEBSOCKETS_NETWORK_SERVER_CLASS AsyncServer
195195

196-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
196+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
197197

198198
#if !defined(ESP8266) && !defined(ESP31B)
199199
#error "network type ESP8266 only possible on the ESP mcu!"
@@ -213,7 +213,7 @@
213213
#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure
214214
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
215215

216-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100)
216+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100)
217217

218218
#ifdef STM32_DEVICE
219219
#define WEBSOCKETS_NETWORK_CLASS TCPClient
@@ -225,13 +225,13 @@
225225
#define WEBSOCKETS_NETWORK_SERVER_CLASS EthernetServer
226226
#endif
227227

228-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ENC28J60)
228+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ENC28J60)
229229

230230
#include <UIPEthernet.h>
231231
#define WEBSOCKETS_NETWORK_CLASS UIPClient
232232
#define WEBSOCKETS_NETWORK_SERVER_CLASS UIPServer
233233

234-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
234+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32)
235235

236236
#include <WiFi.h>
237237
#include <WiFiClientSecure.h>
@@ -240,13 +240,13 @@
240240
#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure
241241
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
242242

243-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32_ETH)
243+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32_ETH)
244244

245245
#include <ETH.h>
246246
#define WEBSOCKETS_NETWORK_CLASS WiFiClient
247247
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
248248

249-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
249+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
250250

251251
#include <WiFi.h>
252252
#include <WiFiClientSecure.h>
@@ -255,13 +255,13 @@
255255
#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiClientSecure
256256
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
257257

258-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
258+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
259259

260260
#include <WiFiS3.h>
261261
#define WEBSOCKETS_NETWORK_CLASS WiFiClient
262262
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
263263

264-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA)
264+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA)
265265
#if __has_include(<WiFiNINA.h>)
266266
#include <WiFiNINA.h>
267267
#else
@@ -272,7 +272,7 @@
272272
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
273273
#define WEBSOCKETS_NETWORK_SSL_CLASS WiFiSSLClient
274274

275-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED)
275+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED)
276276
#if __has_include(<rpcWiFi.h>) && __has_include(<rpcWiFiClientSecure.h>)
277277
#include <rpcWiFi.h>
278278
#include <rpcWiFiClientSecure.h>
@@ -287,7 +287,7 @@
287287
#define WEBSOCKETS_NETWORK_CLASS WiFiClient
288288
#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
289289

290-
#elif(WEBSOCKETS_NETWORK_TYPE == NETWORK_CUSTOM)
290+
#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_CUSTOM)
291291
#include <WebSocketsNetworkClientSecure.h>
292292
#include <WiFiServer.h>
293293

@@ -376,7 +376,7 @@ typedef struct {
376376
bool isSocketIO = false; ///< client for socket.io server
377377

378378
#if defined(HAS_SSL)
379-
bool isSSL = false; ///< run in ssl mode
379+
bool isSSL = false; ///< run in ssl mode
380380
WEBSOCKETS_NETWORK_SSL_CLASS * ssl = nullptr;
381381
#endif
382382

@@ -413,7 +413,7 @@ typedef struct {
413413
uint8_t disconnectTimeoutCount = 0; // after how many subsequent pong timeouts discconnect will happen, 0 means "do not disconnect"
414414
uint8_t pongTimeoutCount = 0; // current pong timeout count
415415

416-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
416+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
417417
String cHttpLine; ///< HTTP header lines
418418
#endif
419419

‎src/WebSockets4WebServer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <WebSocketsServer.h>
2929
#include <ESP8266WebServer.h>
3030

31-
#if((WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)) && WEBSERVER_HAS_HOOK
31+
#if ((WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)) && WEBSERVER_HAS_HOOK
3232

3333
class WebSockets4WebServer : public WebSocketsServerCore {
3434
#if defined(ESP8266)

‎src/WebSocketsClient.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void WebSocketsClient::begin(const char * host, uint16_t port, const char * url,
8888
// todo find better seed
8989
randomSeed(millis());
9090
#endif
91-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
91+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
9292
asyncConnect();
9393
#endif
9494

@@ -225,7 +225,7 @@ void WebSocketsClient::beginSocketIOSSLWithCA(const char * host, uint16_t port,
225225

226226
#endif
227227

228-
#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
228+
#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
229229
/**
230230
* called in arduino loop
231231
*/
@@ -244,7 +244,7 @@ void WebSocketsClient::loop(void) {
244244
if(_client.isSSL) {
245245
DEBUG_WEBSOCKETS("[WS-Client] connect wss...\n");
246246
if(_client.ssl) {
247-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
247+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
248248
// does not support delete (no destructor)
249249
#else
250250
delete _client.ssl;
@@ -261,7 +261,7 @@ void WebSocketsClient::loop(void) {
261261
_client.ssl->setCACert(_CA_cert);
262262
#elif defined(ESP8266) && defined(SSL_AXTLS)
263263
_client.ssl->setCACert((const uint8_t *)_CA_cert, strlen(_CA_cert) + 1);
264-
#elif(defined(ESP8266) || defined(ARDUINO_ARCH_RP2040)) && defined(SSL_BARESSL)
264+
#elif (defined(ESP8266) || defined(ARDUINO_ARCH_RP2040)) && defined(SSL_BARESSL)
265265
_client.ssl->setTrustAnchors(_CA_cert);
266266
#elif defined(WIO_TERMINAL) || defined(SEEED_XIAO_M0)
267267
_client.ssl->setCACert(_CA_cert);
@@ -294,7 +294,7 @@ void WebSocketsClient::loop(void) {
294294
} else {
295295
DEBUG_WEBSOCKETS("[WS-Client] connect ws...\n");
296296
if(_client.tcp) {
297-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
297+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
298298
// does not support delete (no destructor)
299299
#else
300300
delete _client.tcp;
@@ -540,16 +540,16 @@ void WebSocketsClient::clientDisconnect(WSclient_t * client) {
540540

541541
if(client->tcp) {
542542
if(client->tcp->connected()) {
543-
#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
543+
#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
544544
client->tcp->flush();
545545
#endif
546546
client->tcp->stop();
547547
}
548548
event = true;
549-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
549+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
550550
client->status = WSC_NOT_CONNECTED;
551551
#else
552-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
552+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_UNOWIFIR4)
553553
// does not support delete (no destructor)
554554
#else
555555
delete client->tcp;
@@ -605,7 +605,7 @@ bool WebSocketsClient::clientIsConnected(WSclient_t * client) {
605605

606606
return false;
607607
}
608-
#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
608+
#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
609609
/**
610610
* Handel incomming data from Client
611611
*/
@@ -726,7 +726,7 @@ void WebSocketsClient::sendHeader(WSclient_t * client) {
726726
DEBUG_WEBSOCKETS("[WS-Client][sendHeader] handshake %s", (uint8_t *)handshake.c_str());
727727
write(client, (uint8_t *)handshake.c_str(), handshake.length());
728728

729-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
729+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
730730
client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
731731
#endif
732732

@@ -801,7 +801,7 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
801801
}
802802

803803
(*headerLine) = "";
804-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
804+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
805805
client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
806806
#endif
807807
} else {
@@ -871,7 +871,7 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
871871
headerDone(client);
872872

873873
runCbEvent(WStype_CONNECTED, (uint8_t *)client->cUrl.c_str(), client->cUrl.length());
874-
#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
874+
#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
875875
} else if(client->isSocketIO) {
876876
if(client->cSessionId.length() > 0) {
877877
DEBUG_WEBSOCKETS("[WS-Client][handleHeader] found cSessionId\n");
@@ -899,7 +899,7 @@ void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
899899
void WebSocketsClient::connectedCb() {
900900
DEBUG_WEBSOCKETS("[WS-Client] connected to %s:%u.\n", _host.c_str(), _port);
901901

902-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
902+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
903903
_client.tcp->onDisconnect(std::bind([](WebSocketsClient * c, AsyncTCPbuffer * obj, WSclient_t * client) -> bool {
904904
DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
905905
client->status = WSC_NOT_CONNECTED;
@@ -915,12 +915,12 @@ void WebSocketsClient::connectedCb() {
915915

916916
_client.status = WSC_HEADER;
917917

918-
#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
918+
#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
919919
// set Timeout for readBytesUntil and readStringUntil
920920
_client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
921921
#endif
922922

923-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
923+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP32) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_RP2040)
924924
_client.tcp->setNoDelay(true);
925925
#endif
926926

@@ -950,7 +950,7 @@ void WebSocketsClient::connectFailedCb() {
950950
DEBUG_WEBSOCKETS("[WS-Client] connection to %s:%u Failed\n", _host.c_str(), _port);
951951
}
952952

953-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
953+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
954954

955955
void WebSocketsClient::asyncConnect() {
956956
DEBUG_WEBSOCKETS("[WS-Client] asyncConnect...\n");

‎src/WebSocketsClient.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class WebSocketsClient : protected WebSockets {
7777
#endif
7878
#endif
7979

80-
#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
80+
#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
8181
void loop(void);
8282
#else
8383
// Async interface not need a loop call
@@ -140,7 +140,7 @@ class WebSocketsClient : protected WebSockets {
140140
#define SSL_FINGERPRINT_NULL NULL
141141
#endif
142142

143-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA)
143+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_SAMD_SEED) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_WIFI_NINA)
144144
const char * _CA_cert;
145145
const uint8_t * _CA_bundle;
146146
#endif
@@ -159,7 +159,7 @@ class WebSocketsClient : protected WebSockets {
159159
void clientDisconnect(WSclient_t * client);
160160
bool clientIsConnected(WSclient_t * client);
161161

162-
#if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
162+
#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
163163
void handleClientData(void);
164164
#endif
165165

@@ -171,7 +171,7 @@ class WebSocketsClient : protected WebSockets {
171171

172172
void handleHBPing(); // send ping in specified intervals
173173

174-
#if(WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
174+
#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
175175
void asyncConnect();
176176
#endif
177177

0 commit comments

Comments
 (0)