Cleaned up compilation with logging enabled

- Removed list of warnings on signedness of integers in printf
- Fixed issue with "true" in ifdef

Author: geky

LittleFileSystem.cpp

@@ -169,7 +169,7 @@ int LittleFileSystem::mount(BlockDevice *bd) {
 
 int LittleFileSystem::unmount() {
     _mutex.lock();
-    LFS_INFO("unmount()", "");
+    LFS_INFO("unmount(%s)", "");
     if (_bd) {
         int err = lfs_unmount(&_lfs);
         if (err) {
@@ -196,7 +196,7 @@ int LittleFileSystem::unmount() {
 int LittleFileSystem::format(BlockDevice *bd,
         lfs_size_t read_size, lfs_size_t prog_size,
         lfs_size_t block_size, lfs_size_t lookahead) {
-    LFS_INFO("format(%p, %d, %d, %d, %d)",
+    LFS_INFO("format(%p, %ld, %ld, %ld, %ld)",
             bd, read_size, prog_size, block_size, lookahead);
     int err = bd->init();
     if (err) {
@@ -309,7 +309,7 @@ int LittleFileSystem::rename(const char *oldname, const char *newname) {
 
 int LittleFileSystem::mkdir(const char *name, mode_t mode) {
     _mutex.lock();
-    LFS_INFO("mkdir(\"%s\", 0x%x)", name, mode);
+    LFS_INFO("mkdir(\"%s\", 0x%lx)", name, mode);
     int err = lfs_mkdir(&_lfs, name);
     LFS_INFO("mkdir -> %d", lfs_toerror(err));
     _mutex.unlock();
@@ -385,7 +385,7 @@ int LittleFileSystem::file_sync(fs_file_t file) {
 off_t LittleFileSystem::file_seek(fs_file_t file, off_t offset, int whence) {
     lfs_file_t *f = (lfs_file_t *)file;
     _mutex.lock();
-    LFS_INFO("file_seek(%p, %d, %d)", file, offset, whence);
+    LFS_INFO("file_seek(%p, %ld, %d)", file, offset, whence);
     off_t res = lfs_file_seek(&_lfs, f, offset, lfs_fromwhence(whence));
     LFS_INFO("file_seek -> %d", lfs_toerror(res));
     _mutex.unlock();
@@ -454,9 +454,9 @@ ssize_t LittleFileSystem::dir_read(fs_dir_t dir, struct dirent *ent) {
 void LittleFileSystem::dir_seek(fs_dir_t dir, off_t offset) {
     lfs_dir_t *d = (lfs_dir_t *)dir;
     _mutex.lock();
-    LFS_INFO("dir_seek(%p, %d)", dir, offset);
+    LFS_INFO("dir_seek(%p, %ld)", dir, offset);
     lfs_dir_seek(&_lfs, d, offset);
-    LFS_INFO("dir_seek -> void", "");
+    LFS_INFO("dir_seek -> %s", "void");
     _mutex.unlock();
 }
 
@@ -475,7 +475,7 @@ void LittleFileSystem::dir_rewind(fs_dir_t dir) {
     _mutex.lock();
     LFS_INFO("dir_rewind(%p)", dir);
     lfs_dir_rewind(&_lfs, d);
-    LFS_INFO("dir_rewind -> void", "");
+    LFS_INFO("dir_rewind -> %s", "void");
     _mutex.unlock();
 }
 

littlefs/lfs.c

@@ -2027,7 +2027,7 @@ int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) {
     }
 
     if (superblock.d.version > (0x00010001 | 0x0000ffff)) {
-        LFS_ERROR("Invalid version %ld.%ld\n",
+        LFS_ERROR("Invalid version %ld.%ld",
                 0xffff & (superblock.d.version >> 16),
                 0xffff & (superblock.d.version >> 0));
         return LFS_ERR_INVAL;
@@ -2343,14 +2343,14 @@ int lfs_deorphan(lfs_t *lfs) {
                 }
 
                 if (moved) {
-                    LFS_DEBUG("Found move %d %d",
+                    LFS_DEBUG("Found move %ld %ld",
                             entry.d.u.dir[0], entry.d.u.dir[1]);
                     int err = lfs_dir_remove(lfs, &cwd, &entry);
                     if (err) {
                         return err;
                     }
                 } else {
-                    LFS_DEBUG("Found partial move %d %d",
+                    LFS_DEBUG("Found partial move %ld %ld",
                             entry.d.u.dir[0], entry.d.u.dir[1]);
                     entry.d.type &= ~0x80;
                     int err = lfs_dir_update(lfs, &cwd, &entry, NULL);

littlefs/lfs_util.h

@@ -98,31 +98,31 @@ void lfs_crc(uint32_t *crc, const void *buffer, size_t size);
 #define MBED_LFS_ENABLE_ERROR true
 #endif
 
-#if MBED_LFS_ENABLE_INFO == true
+#if MBED_LFS_ENABLE_INFO
 #define LFS_INFO(fmt, ...)  printf("lfs info: " fmt "\n", __VA_ARGS__)
 #elif !defined(MBED_LFS_ENABLE_INFO)
 #define LFS_INFO(fmt, ...)  debug("lfs info: " fmt "\n", __VA_ARGS__)
 #else
 #define LFS_INFO(fmt, ...)
 #endif
 
-#if MBED_LFS_ENABLE_DEBUG == true
+#if MBED_LFS_ENABLE_DEBUG
 #define LFS_DEBUG(fmt, ...)  printf("lfs debug: " fmt "\n", __VA_ARGS__)
 #elif !defined(MBED_LFS_ENABLE_DEBUG)
 #define LFS_DEBUG(fmt, ...)  debug("lfs debug: " fmt "\n", __VA_ARGS__)
 #else
 #define LFS_DEBUG(fmt, ...)
 #endif
 
-#if MBED_LFS_ENABLE_WARN == true
+#if MBED_LFS_ENABLE_WARN
 #define LFS_WARN(fmt, ...)  printf("lfs warn: " fmt "\n", __VA_ARGS__)
 #elif !defined(MBED_LFS_ENABLE_WARN)
 #define LFS_WARN(fmt, ...)  debug("lfs warn: " fmt "\n", __VA_ARGS__)
 #else
 #define LFS_WARN(fmt, ...)
 #endif
 
-#if MBED_LFS_ENABLE_ERROR == true
+#if MBED_LFS_ENABLE_ERROR
 #define LFS_ERROR(fmt, ...)  printf("lfs error: " fmt "\n", __VA_ARGS__)
 #elif !defined(MBED_LFS_ENABLE_ERROR)
 #define LFS_ERROR(fmt, ...)  debug("lfs error: " fmt "\n", __VA_ARGS__)