From 4db14451fb8b47ee620e3ef6687fd591ab5f6a30 Mon Sep 17 00:00:00 2001 From: Links Date: Mon, 26 Oct 2020 17:04:19 +0100 Subject: [PATCH] clang-format --- src/WebSockets.cpp | 4 ++-- src/WebSocketsClient.cpp | 11 +++++------ src/WebSocketsClient.h | 2 +- src/WebSocketsServer.h | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/WebSockets.cpp b/src/WebSockets.cpp index 8c8ef82..ef8224c 100644 --- a/src/WebSockets.cpp +++ b/src/WebSockets.cpp @@ -644,7 +644,7 @@ bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWait } else { //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n); } - if (n > 0) { + if(n > 0) { WEBSOCKETS_YIELD(); } } @@ -698,7 +698,7 @@ size_t WebSockets::write(WSclient_t * client, uint8_t * out, size_t n) { } else { DEBUG_WEBSOCKETS("WS write %d failed left %d!\n", len, n); } - if (n > 0) { + if(n > 0) { WEBSOCKETS_YIELD(); } } diff --git a/src/WebSocketsClient.cpp b/src/WebSocketsClient.cpp index 6ec0af1..bc6a42e 100644 --- a/src/WebSocketsClient.cpp +++ b/src/WebSocketsClient.cpp @@ -136,7 +136,7 @@ void WebSocketsClient::beginSslWithCA(const char * host, uint16_t port, const ch void WebSocketsClient::setSSLClientCertKey(BearSSL::X509List * clientCert, BearSSL::PrivateKey * clientPrivateKey) { _client_cert = clientCert; - _client_key = clientPrivateKey; + _client_key = clientPrivateKey; } void WebSocketsClient::setSSLClientCertKey(const char * clientCert, const char * clientPrivateKey) { @@ -156,7 +156,7 @@ void WebSocketsClient::beginSocketIO(String host, uint16_t port, String url, Str } #if defined(HAS_SSL) -void WebSocketsClient::beginSocketIOSSL(const char * host, uint16_t port, const char * url, const char * protocol) { +void WebSocketsClient::beginSocketIOSSL(const char * host, uint16_t port, const char * url, const char * protocol) { begin(host, port, url, protocol); _client.isSocketIO = true; _client.isSSL = true; @@ -168,12 +168,12 @@ void WebSocketsClient::beginSocketIOSSL(String host, uint16_t port, String url, } #if defined(SSL_BARESSL) -void WebSocketsClient::beginSocketIOSSLWithCA(const char * host, uint16_t port, const char * url, BearSSL::X509List * CA_cert, const char * protocol) { +void WebSocketsClient::beginSocketIOSSLWithCA(const char * host, uint16_t port, const char * url, BearSSL::X509List * CA_cert, const char * protocol) { begin(host, port, url, protocol); _client.isSocketIO = true; _client.isSSL = true; _fingerprint = SSL_FINGERPRINT_NULL; - _CA_cert = CA_cert; + _CA_cert = CA_cert; } #endif @@ -189,7 +189,6 @@ void WebSocketsClient::beginSocketIOSSLWithCA(const char * host, uint16_t port, #endif } - #endif #if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) @@ -236,7 +235,7 @@ void WebSocketsClient::loop(void) { } if(_client_cert && _client_key) { _client.ssl->setClientRSACert(_client_cert, _client_key); - DEBUG_WEBSOCKETS("[WS-Client] setting client certificate and key"); + DEBUG_WEBSOCKETS("[WS-Client] setting client certificate and key"); #endif } } else { diff --git a/src/WebSocketsClient.h b/src/WebSocketsClient.h index cc9a0c7..15863a7 100644 --- a/src/WebSocketsClient.h +++ b/src/WebSocketsClient.h @@ -67,7 +67,7 @@ class WebSocketsClient : protected WebSockets { void beginSocketIOSSLWithCA(const char * host, uint16_t port, const char * url = "/socket.io/?EIO=3", BearSSL::X509List * CA_cert = NULL, const char * protocol = "arduino"); #endif #endif - + #if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC) void loop(void); #else diff --git a/src/WebSocketsServer.h b/src/WebSocketsServer.h index 27adf09..2541788 100644 --- a/src/WebSocketsServer.h +++ b/src/WebSocketsServer.h @@ -93,7 +93,7 @@ class WebSocketsServer : protected WebSockets { int connectedClients(bool ping = false); bool clientIsConnected(uint8_t num); - + void enableHeartbeat(uint32_t pingInterval, uint32_t pongTimeout, uint8_t disconnectTimeoutCount); void disableHeartbeat();