Remove global, make metadata length a member of FS

Author: earlephilhower

cores/esp8266/spiffs/spiffs.h

@@ -291,6 +291,8 @@ typedef struct spiffs_t {
   void *user_data;
   // config magic
   u32_t config_magic;
+  // active metadata length
+  u32_t obj_meta_len;
 } spiffs;
 
 /* spiffs file status struct */
@@ -300,7 +302,7 @@ typedef struct {
   spiffs_obj_type type;
   spiffs_page_ix pix;
   u8_t name[SPIFFS_OBJ_NAME_LEN];
-  u8_t meta[4]; // Set to the largest supported metadata len
+  u8_t meta[SPIFFS_MAX_META]; // Set to the largest supported metadata len
 } spiffs_stat;
 
 struct spiffs_dirent {
@@ -309,7 +311,7 @@ struct spiffs_dirent {
   spiffs_obj_type type;
   u32_t size;
   spiffs_page_ix pix;
-  u8_t meta[4]; // Set to the largest supported metadata len
+  u8_t meta[SPIFFS_MAX_META]; // Set to the largest supported metadata len
 };
 
 typedef struct {

cores/esp8266/spiffs/spiffs_config.h

@@ -28,8 +28,7 @@ typedef uint8_t u8_t;
 
 // Enable supporting both timestamped and non-timestamped FS images by making
 // the meta-len a global variable here and by changing the logic of SPIFFS.begin.
-extern int __SPIFFS_obj_meta_len;
-#define SPIFFS_OBJ_META_LEN (__SPIFFS_obj_meta_len)
+#define SPIFFS_OBJ_META_LEN (fs->obj_meta_len)
 #define SPIFFS_MAX_META (4) // Maximum metadata size allowed at runtime
 // Because SPIFFS reads binary images of blocks, we need to be sure to actually ensure there is space to
 // keep the metadata (since 0 bytes are allocated in the struct itself).  Use an anonymous union to ensure

cores/esp8266/spiffs_api.cpp

@@ -25,8 +25,6 @@
 
 using namespace fs;
 
-int __SPIFFS_obj_meta_len = 0;
-
 namespace spiffs_impl {
 
 
@@ -54,7 +52,7 @@ FileImplPtr SPIFFSImpl::open(const char* path, OpenMode openMode, AccessMode acc
                fd, path, openMode, accessMode, _fs.err_code);
         return FileImplPtr();
     }
-    if (!(mode & SPIFFS_O_RDONLY) && __SPIFFS_obj_meta_len==sizeof(4)) {
+    if (!(mode & SPIFFS_O_RDONLY) && _fs.obj_meta_len) {
         time_t t = time(NULL);
         struct tm tmr;
         localtime_r(&t, &tmr);

cores/esp8266/spiffs_api.h

@@ -39,7 +39,6 @@ extern "C" {
 
 using namespace fs;
 
-extern int __SPIFFS_obj_meta_len;
 namespace spiffs_impl {
 
 int getSpiffsMode(OpenMode openMode, AccessMode accessMode);
@@ -273,8 +272,8 @@ class SPIFFSImpl : public FSImpl
             }
         }
         // Make sure we format with requested metadata len
-        __SPIFFS_obj_meta_len = _cfg._enableTime ? 4 : 0;
-        DEBUGV("SPIFFSImpl::_formatOldOrNew formatting with metadata==%d\r\n", __SPIFFS_obj_meta_len);
+        _fs.obj_meta_len = _cfg._enableTime ? 4 : 0;
+        DEBUGV("SPIFFSImpl::_formatOldOrNew formatting with metadata==%d\r\n", _fs.obj_meta_len);
         spiffs_config config = _setupSpiffsConfig(_cfg._enableTime);
 
         // We need to try a mount on SPIFFS, even though it will probably fail, to make the opaque
@@ -326,18 +325,18 @@ class SPIFFSImpl : public FSImpl
         // First, can we mount w/o metadata (preserve backwards)
         int err;
         if ( !_is_metadata_fs(_start, _blockSize, _pageSize) ) {
-            __SPIFFS_obj_meta_len = 0;
+            _fs.obj_meta_len = 0;
             DEBUGV("SPIFFSImpl: trying fs @%x, size=%x, block=%x, page=%x, metadata=%d\r\n",
-                 _start, _size, _blockSize, _pageSize, __SPIFFS_obj_meta_len);
+                 _start, _size, _blockSize, _pageSize, _fs.obj_meta_len);
             err = SPIFFS_mount(&_fs, &config, _workBuf.get(),
                                _fdsBuf.get(), fdsBufSize, _cacheBuf.get(), cacheBufSize,
                                &SPIFFSImpl::_check_cb);
 	} else {
             // Flag matched, it's a metadata FS
-            __SPIFFS_obj_meta_len = 4;
+            _fs.obj_meta_len = 4;
             config = _setupSpiffsConfig(true);
             DEBUGV("SPIFFSImpl: doesn't look like old metadata==0, so trying fs @%x, size=%x, block=%x, page=%x, metadata=%d\r\n",
-                   _start, _size, _blockSize, _pageSize, __SPIFFS_obj_meta_len);
+                   _start, _size, _blockSize, _pageSize, _fs.obj_meta_len);
             err = SPIFFS_mount(&_fs, &config, _workBuf.get(),
                                 _fdsBuf.get(), fdsBufSize, _cacheBuf.get(), cacheBufSize,
                                 &SPIFFSImpl::_check_cb);
@@ -573,7 +572,7 @@ class SPIFFSFileImpl : public FileImpl
     {
         CHECKFD();
         time_t t = 0;
-        if (__SPIFFS_obj_meta_len) {
+        if (_fs->getFs()->obj_meta_len) {
             _getStat() ;
             memcpy(&t, _stat.meta, sizeof(time_t));
         }