Add lfs_stata, lfs_dir_reada functions

Extends regular `lfs_stat` by querying set of attribute at the same time.
Improves performance of directory listings.

Author: mikee47

lfs.c

@@ -1411,7 +1411,8 @@ static int lfs_dir_getgstate(lfs_t *lfs, const lfs_mdir_t *dir,
 }
 
 static int lfs_dir_getinfo(lfs_t *lfs, lfs_mdir_t *dir,
-        uint16_t id, struct lfs_info *info, const struct lfs_stat_config* config) {
+        uint16_t id, struct lfs_info *info,
+        struct lfs_attr *attrs, lfs_size_t attr_count) {
     if (id == 0x3ff) {
         // special case for root
         strcpy(info->name, "/");
@@ -1442,13 +1443,12 @@ static int lfs_dir_getinfo(lfs_t *lfs, lfs_mdir_t *dir,
     }
 
     // fetch attrs
-    if(config != NULL) {
-        for (unsigned i = 0; i < config->attr_count; i++) {
+    if(attrs != NULL) {
+        for (unsigned i = 0; i < attr_count; i++) {
             lfs_stag_t res = lfs_dir_get(lfs, dir,
                     LFS_MKTAG(0x7ff, 0x3ff, 0),
-                    LFS_MKTAG(LFS_TYPE_USERATTR + config->attrs[i].type,
-                        id, config->attrs[i].size),
-                        config->attrs[i].buffer);
+                    LFS_MKTAG(LFS_TYPE_USERATTR + attrs[i].type,
+                        id, attrs[i].size), attrs[i].buffer);
             if (res < 0 && res != LFS_ERR_NOENT) {
                 return res;
             }
@@ -2783,8 +2783,8 @@ static int lfs_dir_close_(lfs_t *lfs, lfs_dir_t *dir) {
     return 0;
 }
 
-static int lfs_dir_read_(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info,
-        const struct lfs_stat_config* config) {
+static int lfs_dir_reada_(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info,
+        struct lfs_attr *attrs, lfs_size_t attr_count) {
     memset(info, 0, sizeof(*info));
 
     // special offset for '.' and '..'
@@ -2814,7 +2814,7 @@ static int lfs_dir_read_(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info,
             dir->id = 0;
         }
 
-        int err = lfs_dir_getinfo(lfs, &dir->m, dir->id, info, config);
+        int err = lfs_dir_getinfo(lfs, &dir->m, dir->id, info, attrs, attr_count);
         if (err && err != LFS_ERR_NOENT) {
             return err;
         }
@@ -3970,8 +3970,8 @@ static int lfs_file_enumattr_(lfs_t* lfs, lfs_file_t* file,
 }
 
 /// General fs operations ///
-static int lfs_stat_(lfs_t *lfs, const char *path, struct lfs_info *info,
-        const struct lfs_stat_config* config) {
+static int lfs_stata_(lfs_t *lfs, const char *path, struct lfs_info *info,
+        struct lfs_attr *attrs, lfs_size_t attr_count) {
     lfs_mdir_t cwd;
     lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL);
     if (tag < 0) {
@@ -3984,7 +3984,7 @@ static int lfs_stat_(lfs_t *lfs, const char *path, struct lfs_info *info,
         return LFS_ERR_NOTDIR;
     }
 
-    return lfs_dir_getinfo(lfs, &cwd, lfs_tag_id(tag), info, config);
+    return lfs_dir_getinfo(lfs, &cwd, lfs_tag_id(tag), info, attrs, attr_count);
 }
 
 #ifndef LFS_READONLY
@@ -6184,15 +6184,15 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) {
 }
 #endif
 
-int lfs_statcfg(lfs_t *lfs, const char *path, struct lfs_info *info,
-        const struct lfs_stat_config* config) {
+int lfs_stata(lfs_t *lfs, const char *path, struct lfs_info *info,
+        struct lfs_attr *attrs, lfs_size_t attr_count) {
     int err = LFS_LOCK(lfs->cfg);
     if (err) {
         return err;
     }
     LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info);
 
-    err = lfs_stat_(lfs, path, info, config);
+    err = lfs_stata_(lfs, path, info, attrs, attr_count);
 
     LFS_TRACE("lfs_stat -> %d", err);
     LFS_UNLOCK(lfs->cfg);
@@ -6496,16 +6496,16 @@ int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) {
     return err;
 }
 
-int lfs_dir_readcfg(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info,
-        const struct lfs_stat_config* config) {
+int lfs_dir_reada(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info,
+        struct lfs_attr *attrs, lfs_size_t attr_count) {
     int err = LFS_LOCK(lfs->cfg);
     if (err) {
         return err;
     }
     LFS_TRACE("lfs_dir_read(%p, %p, %p)",
             (void*)lfs, (void*)dir, (void*)info);
 
-    err = lfs_dir_read_(lfs, dir, info, config);
+    err = lfs_dir_reada_(lfs, dir, info, attrs, attr_count);
 
     LFS_TRACE("lfs_dir_read -> %d", err);
     LFS_UNLOCK(lfs->cfg);

lfs.h

@@ -365,15 +365,6 @@ struct lfs_file_config {
     lfs_size_t attr_count;
 };
 
-// Configuration provided during lfs_dir_readcfg and lfs_statcfg
-struct lfs_stat_config {
-    // Optional list of custom attributes to read
-    struct lfs_attr *attrs;
-
-    // Number of custom attributes in the list
-    lfs_size_t attr_count;
-};
-
 /// internal littlefs data structures ///
 typedef struct lfs_cache {
     lfs_block_t block;
@@ -528,15 +519,15 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath);
 #endif
 
 // Find info about a file or directory and read set of custom attributes
-int lfs_statcfg(lfs_t *lfs, const char *path, struct lfs_info *info,
-        const struct lfs_stat_config* config);
+int lfs_stata(lfs_t *lfs, const char *path, struct lfs_info *info,
+        struct lfs_attr *attrs, lfs_size_t attr_count);
 
 // Find info about a file or directory
 //
 // Fills out the info structure, based on the specified file or directory.
 // Returns a negative error code on failure.
 static inline int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) {
-    return lfs_statcfg(lfs, path, info, NULL);
+    return lfs_stata(lfs, path, info, NULL, 0);
 }
 
 // Get a custom attribute
@@ -704,16 +695,16 @@ int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path);
 int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir);
 
 // Read directory entry plus attributes
-int lfs_dir_readcfg(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info,
-        const struct lfs_stat_config* config);
+int lfs_dir_reada(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info,
+        struct lfs_attr *attrs, lfs_size_t attr_count);
 
 // Read an entry in the directory
 //
 // Fills out the info structure, based on the specified file or directory.
 // Returns a positive value on success, 0 at the end of directory,
 // or a negative error code on failure.
 static inline int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) {
-    return lfs_dir_readcfg(lfs, dir, info, NULL);
+    return lfs_dir_reada(lfs, dir, info, NULL, 0);
 }
 
 // Change the position of the directory