Revert "Allman now (#6080)" (#6090)

This reverts commit 98125f8860.

cores/esp8266/FS.h

@@ -1,22 +1,22 @@
 /*
-    FS.h - file system wrapper
-    Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
-    This file is part of the esp8266 core for Arduino environment.
+ FS.h - file system wrapper
+ Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
+ This file is part of the esp8266 core for Arduino environment.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
 
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #ifndef FS_H
 #define FS_H
@@ -24,8 +24,7 @@
 #include <memory>
 #include <Arduino.h>
 
-namespace fs
-{
+namespace fs {
 
 class File;
 class Dir;
@@ -41,8 +40,7 @@ typedef std::shared_ptr<DirImpl> DirImplPtr;
 template <typename Tfs>
 bool mount(Tfs& fs, const char* mountPoint);
 
-enum SeekMode
-{
+enum SeekMode {
     SeekSet = 0,
     SeekCur = 1,
     SeekEnd = 2
@@ -62,14 +60,12 @@ public:
     int read() override;
     int peek() override;
     void flush() override;
-    size_t readBytes(char *buffer, size_t length)  override
-    {
+    size_t readBytes(char *buffer, size_t length)  override {
         return read((uint8_t*)buffer, length);
     }
     size_t read(uint8_t* buf, size_t size);
     bool seek(uint32_t pos, SeekMode mode);
-    bool seek(uint32_t pos)
-    {
+    bool seek(uint32_t pos) {
         return seek(pos, SeekSet);
     }
     size_t position() const;
@@ -84,29 +80,26 @@ public:
     bool isDirectory() const;
 
     // Arduino "class SD" methods for compatibility
-    template<typename T> size_t write(T &src)
-    {
-        uint8_t obuf[256];
-        size_t doneLen = 0;
-        size_t sentLen;
-        int i;
+    template<typename T> size_t write(T &src){
+      uint8_t obuf[256];
+      size_t doneLen = 0;
+      size_t sentLen;
+      int i;
 
-        while (src.available() > sizeof(obuf))
-        {
-            src.read(obuf, sizeof(obuf));
-            sentLen = write(obuf, sizeof(obuf));
-            doneLen = doneLen + sentLen;
-            if (sentLen != sizeof(obuf))
-            {
-                return doneLen;
-            }
-        }
-
-        size_t leftLen = src.available();
-        src.read(obuf, leftLen);
-        sentLen = write(obuf, leftLen);
+      while (src.available() > sizeof(obuf)){
+        src.read(obuf, sizeof(obuf));
+        sentLen = write(obuf, sizeof(obuf));
         doneLen = doneLen + sentLen;
-        return doneLen;
+        if(sentLen != sizeof(obuf)){
+          return doneLen;
+        }
+      }
+
+      size_t leftLen = src.available();
+      src.read(obuf, leftLen);
+      sentLen = write(obuf, leftLen);
+      doneLen = doneLen + sentLen;
+      return doneLen;
     }
     using Print::write;
 
@@ -123,8 +116,7 @@ protected:
     FS                  *_baseFS;
 };
 
-class Dir
-{
+class Dir {
 public:
     Dir(DirImplPtr impl = DirImplPtr(), FS *baseFS = nullptr): _impl(impl), _baseFS(baseFS) { }
 
@@ -143,8 +135,7 @@ protected:
     FS       *_baseFS;
 };
 
-struct FSInfo
-{
+struct FSInfo {
     size_t totalBytes;
     size_t usedBytes;
     size_t blockSize;
@@ -156,15 +147,13 @@ struct FSInfo
 class FSConfig
 {
 public:
-    FSConfig(bool autoFormat = true)
-    {
+    FSConfig(bool autoFormat = true) {
         _type = FSConfig::fsid::FSId;
-        _autoFormat = autoFormat;
+	_autoFormat = autoFormat;
     }
 
     enum fsid { FSId = 0x00000000 };
-    FSConfig setAutoFormat(bool val = true)
-    {
+    FSConfig setAutoFormat(bool val = true) {
         _autoFormat = val;
         return *this;
     }
@@ -176,10 +165,9 @@ public:
 class SPIFFSConfig : public FSConfig
 {
 public:
-    SPIFFSConfig(bool autoFormat = true)
-    {
+    SPIFFSConfig(bool autoFormat = true) {
         _type = SPIFFSConfig::fsid::FSId;
-        _autoFormat = autoFormat;
+	_autoFormat = autoFormat;
     }
     enum fsid { FSId = 0x53504946 };
 };