code style

Author: Links2004

src/WebSockets.h

@@ -42,7 +42,11 @@
 
 #ifndef NODEBUG_WEBSOCKETS
 #ifdef DEBUG_ESP_PORT
-#define DEBUG_WEBSOCKETS(...) { DEBUG_ESP_PORT.printf(__VA_ARGS__); DEBUG_ESP_PORT.flush(); }
+#define DEBUG_WEBSOCKETS(...)               \
+    {                                       \
+        DEBUG_ESP_PORT.printf(__VA_ARGS__); \
+        DEBUG_ESP_PORT.flush();             \
+    }
 #else
 //#define DEBUG_WEBSOCKETS(...) os_printf( __VA_ARGS__ )
 #endif

src/WebSockets4WebServer.h

@@ -30,22 +30,18 @@
 
 #if WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266 && WEBSERVER_HAS_HOOK
 
-class WebSockets4WebServer: public WebSocketsServerCore {
+class WebSockets4WebServer : public WebSocketsServerCore {
   public:
-
-    WebSockets4WebServer(const String& origin = "", const String& protocol = "arduino"):
-        WebSocketsServerCore(origin, protocol)
-    {
+    WebSockets4WebServer(const String & origin = "", const String & protocol = "arduino")
+        : WebSocketsServerCore(origin, protocol) {
         begin();
     }
 
-    ESP8266WebServer::HookFunction hookForWebserver (const String& wsRootDir, WebSocketServerEvent event)
-    {
+    ESP8266WebServer::HookFunction hookForWebserver(const String & wsRootDir, WebSocketServerEvent event) {
         onEvent(event);
 
-        return [&, wsRootDir](const String & method, const String & url, WiFiClient * tcpClient, ESP8266WebServer::ContentTypeFunction contentType)
-        {
-            if (!(method == "GET" && url.indexOf(wsRootDir) == 0)) {
+        return [&, wsRootDir](const String & method, const String & url, WiFiClient * tcpClient, ESP8266WebServer::ContentTypeFunction contentType) {
+            if(!(method == "GET" && url.indexOf(wsRootDir) == 0)) {
                 return ESP8266WebServer::CLIENT_REQUEST_CAN_CONTINUE;
             }
 
@@ -55,8 +51,7 @@ class WebSockets4WebServer: public WebSocketsServerCore {
             // Then initialize a new WSclient_t (like in WebSocketsServer::handleNewClient())
             WSclient_t * client = handleNewClient(newTcpClient);
 
-            if (client)
-            {
+            if(client) {
                 // give "GET <url>"
                 String headerLine;
                 headerLine.reserve(url.length() + 5);
@@ -71,6 +66,6 @@ class WebSockets4WebServer: public WebSocketsServerCore {
     }
 };
 
-#endif // WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266 && WEBSERVER_HAS_HOOK
+#endif    // WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266 && WEBSERVER_HAS_HOOK
 
-#endif // __WEBSOCKETS4WEBSERVER_H
+#endif    // __WEBSOCKETS4WEBSERVER_H

src/WebSocketsServer.h

@@ -33,8 +33,7 @@
 
 class WebSocketsServerCore : protected WebSockets {
   public:
-
-    WebSocketsServerCore(const String& origin = "", const String& protocol = "arduino");
+    WebSocketsServerCore(const String & origin = "", const String & protocol = "arduino");
     virtual ~WebSocketsServerCore(void);
 
     void begin(void);
@@ -96,7 +95,7 @@ class WebSocketsServerCore : protected WebSockets {
 #endif
 
 #if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-    void loop(void); // handle client data only
+    void loop(void);    // handle client data only
 #endif
 
   protected:
@@ -207,35 +206,32 @@ class WebSocketsServerCore : protected WebSockets {
     /**
      * drop native tcp connection (client->tcp)
     */
-    void dropNativeClient (WSclient_t * client);
+    void dropNativeClient(WSclient_t * client);
 
   private:
     /*
          * returns an indicator whether the given named header exists in the configured _mandatoryHttpHeaders collection
          * @param headerName String ///< the name of the header being checked
          */
     bool hasMandatoryHeader(String headerName);
-
 };
 
-class WebSocketsServer: public WebSocketsServerCore {
+class WebSocketsServer : public WebSocketsServerCore {
   public:
-
-    WebSocketsServer(uint16_t port, const String& origin = "", const String& protocol = "arduino");
+    WebSocketsServer(uint16_t port, const String & origin = "", const String & protocol = "arduino");
     virtual ~WebSocketsServer(void);
 
     void begin(void);
     void close(void);
 
 #if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
-    void loop(void); // handle incoming client and client data
+    void loop(void);    // handle incoming client and client data
 #else
     // Async interface not need a loop call
     void loop(void) __attribute__((deprecated)) {}
 #endif
 
   protected:
-
 #if(WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
     void handleNewClients(void);
 #endif