Allman now (#6080)

* switch restyle script for CI

* remove confirmation

* restyle with allman

libraries/ESP8266WebServer/src/detail/RequestHandler.h

@@ -1,16 +1,43 @@
 #ifndef REQUESTHANDLER_H
 #define REQUESTHANDLER_H
 
-class RequestHandler {
+class RequestHandler
+{
 public:
     virtual ~RequestHandler() { }
-    virtual bool canHandle(HTTPMethod method, String uri) { (void) method; (void) uri; return false; }
-    virtual bool canUpload(String uri) { (void) uri; return false; }
-    virtual bool handle(ESP8266WebServer& server, HTTPMethod requestMethod, String requestUri) { (void) server; (void) requestMethod; (void) requestUri; return false; }
-    virtual void upload(ESP8266WebServer& server, String requestUri, HTTPUpload& upload) { (void) server; (void) requestUri; (void) upload; }
+    virtual bool canHandle(HTTPMethod method, String uri)
+    {
+        (void) method;
+        (void) uri;
+        return false;
+    }
+    virtual bool canUpload(String uri)
+    {
+        (void) uri;
+        return false;
+    }
+    virtual bool handle(ESP8266WebServer& server, HTTPMethod requestMethod, String requestUri)
+    {
+        (void) server;
+        (void) requestMethod;
+        (void) requestUri;
+        return false;
+    }
+    virtual void upload(ESP8266WebServer& server, String requestUri, HTTPUpload& upload)
+    {
+        (void) server;
+        (void) requestUri;
+        (void) upload;
+    }
 
-    RequestHandler* next() { return _next; }
-    void next(RequestHandler* r) { _next = r; }
+    RequestHandler* next()
+    {
+        return _next;
+    }
+    void next(RequestHandler* r)
+    {
+        _next = r;
+    }
 
 private:
     RequestHandler* _next = nullptr;

libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h

@@ -7,47 +7,62 @@
 
 using namespace mime;
 
-class FunctionRequestHandler : public RequestHandler {
+class FunctionRequestHandler : public RequestHandler
+{
 public:
     FunctionRequestHandler(ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn, const String &uri, HTTPMethod method)
-    : _fn(fn)
-    , _ufn(ufn)
-    , _uri(uri)
-    , _method(method)
+        : _fn(fn)
+        , _ufn(ufn)
+        , _uri(uri)
+        , _method(method)
     {
     }
 
-    bool canHandle(HTTPMethod requestMethod, String requestUri) override  {
+    bool canHandle(HTTPMethod requestMethod, String requestUri) override
+    {
         if (_method != HTTP_ANY && _method != requestMethod)
+        {
             return false;
+        }
 
         if (requestUri != _uri)
+        {
             return false;
+        }
 
         return true;
     }
 
-    bool canUpload(String requestUri) override  {
+    bool canUpload(String requestUri) override
+    {
         if (!_ufn || !canHandle(HTTP_POST, requestUri))
+        {
             return false;
+        }
 
         return true;
     }
 
-    bool handle(ESP8266WebServer& server, HTTPMethod requestMethod, String requestUri) override {
+    bool handle(ESP8266WebServer& server, HTTPMethod requestMethod, String requestUri) override
+    {
         (void) server;
         if (!canHandle(requestMethod, requestUri))
+        {
             return false;
+        }
 
         _fn();
         return true;
     }
 
-    void upload(ESP8266WebServer& server, String requestUri, HTTPUpload& upload) override {
+    void upload(ESP8266WebServer& server, String requestUri, HTTPUpload& upload) override
+    {
         (void) server;
         (void) upload;
         if (canUpload(requestUri))
+        {
             _ufn();
+        }
     }
 
 protected:
@@ -57,42 +72,54 @@ protected:
     HTTPMethod _method;
 };
 
-class StaticRequestHandler : public RequestHandler {
+class StaticRequestHandler : public RequestHandler
+{
 public:
     StaticRequestHandler(FS& fs, const char* path, const char* uri, const char* cache_header)
-    : _fs(fs)
-    , _uri(uri)
-    , _path(path)
-    , _cache_header(cache_header)
+        : _fs(fs)
+        , _uri(uri)
+        , _path(path)
+        , _cache_header(cache_header)
     {
         _isFile = fs.exists(path);
         DEBUGV("StaticRequestHandler: path=%s uri=%s isFile=%d, cache_header=%s\r\n", path, uri, _isFile, cache_header);
         _baseUriLength = _uri.length();
     }
 
-    bool canHandle(HTTPMethod requestMethod, String requestUri) override  {
+    bool canHandle(HTTPMethod requestMethod, String requestUri) override
+    {
         if (requestMethod != HTTP_GET)
+        {
             return false;
+        }
 
         if ((_isFile && requestUri != _uri) || !requestUri.startsWith(_uri))
+        {
             return false;
+        }
 
         return true;
     }
 
-    bool handle(ESP8266WebServer& server, HTTPMethod requestMethod, String requestUri) override {
+    bool handle(ESP8266WebServer& server, HTTPMethod requestMethod, String requestUri) override
+    {
         if (!canHandle(requestMethod, requestUri))
+        {
             return false;
+        }
 
         DEBUGV("StaticRequestHandler::handle: request=%s _uri=%s\r\n", requestUri.c_str(), _uri.c_str());
 
         String path(_path);
 
-        if (!_isFile) {
+        if (!_isFile)
+        {
             // Base URI doesn't point to a file.
             // If a directory is requested, look for index file.
-            if (requestUri.endsWith("/")) 
-              requestUri += "index.htm";
+            if (requestUri.endsWith("/"))
+            {
+                requestUri += "index.htm";
+            }
 
             // Append whatever follows this URI in request to get the file path.
             path += requestUri.substring(_baseUriLength);
@@ -103,35 +130,45 @@ public:
 
         // look for gz file, only if the original specified path is not a gz.  So part only works to send gzip via content encoding when a non compressed is asked for
         // if you point the the path to gzip you will serve the gzip as content type "application/x-gzip", not text or javascript etc...
-        if (!path.endsWith(FPSTR(mimeTable[gz].endsWith)) && !_fs.exists(path))  {
+        if (!path.endsWith(FPSTR(mimeTable[gz].endsWith)) && !_fs.exists(path))
+        {
             String pathWithGz = path + FPSTR(mimeTable[gz].endsWith);
-            if(_fs.exists(pathWithGz))
+            if (_fs.exists(pathWithGz))
+            {
                 path += FPSTR(mimeTable[gz].endsWith);
+            }
         }
 
         File f = _fs.open(path, "r");
         if (!f)
+        {
             return false;
+        }
 
         if (_cache_header.length() != 0)
+        {
             server.sendHeader("Cache-Control", _cache_header);
+        }
 
         server.streamFile(f, contentType);
         return true;
     }
 
-    static String getContentType(const String& path) {
+    static String getContentType(const String& path)
+    {
         char buff[sizeof(mimeTable[0].mimeType)];
         // Check all entries but last one for match, return if found
-        for (size_t i=0; i < sizeof(mimeTable)/sizeof(mimeTable[0])-1; i++) {
+        for (size_t i = 0; i < sizeof(mimeTable) / sizeof(mimeTable[0]) - 1; i++)
+        {
             strcpy_P(buff, mimeTable[i].endsWith);
-            if (path.endsWith(buff)) {
+            if (path.endsWith(buff))
+            {
                 strcpy_P(buff, mimeTable[i].mimeType);
                 return String(buff);
             }
         }
         // Fall-through and just return default type
-        strcpy_P(buff, mimeTable[sizeof(mimeTable)/sizeof(mimeTable[0])-1].mimeType);
+        strcpy_P(buff, mimeTable[sizeof(mimeTable) / sizeof(mimeTable[0]) - 1].mimeType);
         return String(buff);
     }
 

libraries/ESP8266WebServer/src/detail/mimetable.cpp

@@ -5,7 +5,7 @@ namespace mime
 {
 
 // Table of extension->MIME strings stored in PROGMEM, needs to be global due to GCC section typing rules
-const Entry mimeTable[maxType] PROGMEM = 
+const Entry mimeTable[maxType] PROGMEM =
 {
     { ".html", "text/html" },
     { ".htm", "text/html" },
@@ -29,7 +29,7 @@ const Entry mimeTable[maxType] PROGMEM =
     { ".zip", "application/zip" },
     { ".gz", "application/x-gzip" },
     { ".appcache", "text/cache-manifest" },
-    { "", "application/octet-stream" } 
+    { "", "application/octet-stream" }
 };
 
 }

libraries/ESP8266WebServer/src/detail/mimetable.h

@@ -7,36 +7,36 @@ namespace mime
 
 enum type
 {
-  html,
-  htm,
-  css,
-  txt,
-  js,
-  json,
-  png,
-  gif,
-  jpg,
-  ico,
-  svg,
-  ttf,
-  otf,
-  woff,
-  woff2,
-  eot,
-  sfnt,
-  xml,
-  pdf,
-  zip,
-  gz,
-  appcache,
-  none,
-  maxType
+    html,
+    htm,
+    css,
+    txt,
+    js,
+    json,
+    png,
+    gif,
+    jpg,
+    ico,
+    svg,
+    ttf,
+    otf,
+    woff,
+    woff2,
+    eot,
+    sfnt,
+    xml,
+    pdf,
+    zip,
+    gz,
+    appcache,
+    none,
+    maxType
 };
 
 struct Entry
 {
-  const char endsWith[16]; 
-  const char mimeType[32];
+    const char endsWith[16];
+    const char mimeType[32];
 };