Fix warnings, update readme, display version

Author: igrr

README.md

@@ -7,20 +7,29 @@ Tool to build and unpack [SPIFFS](https://github.com/pellepl/spiffs) images.
 
 ```
 
-   ./make_spiffs  {-c <pack_dir>|-l} [-s <number>] [--] [--version] [-h]
-                  <image_file>
+   ./mkspiffs  {-c <pack_dir>|-l|-i} [-b <number>] [-p <number>] [-s
+               <number>] [--] [--version] [-h] <image_file>
 
 
 Where: 
 
    -c <pack_dir>,  --create <pack_dir>
-     (OR required)  create spiffs image from a directory
+        create spiffs image from a directory
          -- OR --
    -l,  --list
-     (OR required)  list spiffs image to a directory
+        list files in spiffs image
+         -- OR --
+   -i,  --visualize
+        visualize spiffs image
+
 
+   -b <number>,  --block <number>
+     fs block size, in bytes
 
-   -s <number>,  --fs_size <number>
+   -p <number>,  --page <number>
+     fs page size, in bytes
+
+   -s <number>,  --size <number>
      fs image size, in bytes
 
    --,  --ignore_rest
@@ -35,6 +44,7 @@ Where:
    <image_file>
      (required)  spiffs image file
 
+
 ```
 
 ## License
@@ -44,8 +54,7 @@ MIT
 ## To do
 
 - Error handling
-- Block and page size are hardcoded
-- Determing the image size automatically when opening a file
+- Determine the image size automatically when opening a file
 - Unpack
 - Automated builds
 - Code cleanup

main.cpp

@@ -83,18 +83,15 @@ void spiffsMount(bool init)
     s_spiffsCache.resize((32 + s_pageSize) * maxOpenFiles);
 
 
-    int res = SPIFFS_mount(&s_fs,
-                           &cfg,
-                           &s_spiffsWorkBuf[0],
-                           &s_spiffsFds[0],
-                           s_spiffsFds.size(),
-                           &s_spiffsCache[0],
-                           s_spiffsCache.size(),
-                           NULL);
+    SPIFFS_mount(&s_fs, &cfg, 
+        &s_spiffsWorkBuf[0], 
+        &s_spiffsFds[0], s_spiffsFds.size(),
+        &s_spiffsCache[0], s_spiffsCache.size(),
+        NULL);
 
 //    debugf("mount res: %d\n", res);
     if (init) {
-        spiffs_file fd = SPIFFS_open(&s_fs, "tmp", SPIFFS_CREAT | SPIFFS_TRUNC | SPIFFS_RDWR, 0);
+        spiffs_file fd = SPIFFS_open(&s_fs, (char*) "tmp", SPIFFS_CREAT | SPIFFS_TRUNC | SPIFFS_RDWR, 0);
         uint8_t tmp = 0xff;
         SPIFFS_write(&s_fs, fd, &tmp, 1);
         SPIFFS_fremove(&s_fs, fd);
@@ -187,7 +184,7 @@ void listFiles() {
     spiffs_DIR dir;
     spiffs_dirent ent;
 
-    spiffs_DIR* res = SPIFFS_opendir(&s_fs, 0, &dir);
+    SPIFFS_opendir(&s_fs, 0, &dir);
     spiffs_dirent* it;
     while (true) {
         it = SPIFFS_readdir(&dir, &ent);
@@ -264,7 +261,7 @@ int actionVisualize() {
 
 void processArgs(int argc, const char** argv) {
 
-    TCLAP::CmdLine cmd("", ' ', "0.1");
+    TCLAP::CmdLine cmd("", ' ', VERSION);
     TCLAP::ValueArg<std::string> packArg( "c", "create", "create spiffs image from a directory", true, "", "pack_dir");
     TCLAP::SwitchArg listArg( "l", "list", "list files in spiffs image", false);
     TCLAP::SwitchArg visualizeArg( "i", "visualize", "visualize spiffs image", false);

spiffs/spiffs_cache.c

@@ -195,7 +195,7 @@ s32_t spiffs_phys_wr(
     cache->last_access++;
     cp->last_access = cache->last_access;
 
-    if (cp->flags && SPIFFS_CACHE_FLAG_WRTHRU) {
+    if (cp->flags & SPIFFS_CACHE_FLAG_WRTHRU) {
       // page is being updated, no write-cache, just pass thru
       return fs->cfg.hal_write_f(addr, len, src);
     } else {