Browse Source

Renamed lfs_entry_t -> lfs_mattr_t

Attributes are used to describe more than just entries, so calling these
list of attributes "entries" was inaccurate. However, the name
"attributes" would conflict with "user attributes", user-facing
attributes with a very similar purpose. "user attributes" must be kept
distinct due to differences in binary layout (internal attributes can
use a more compact tag+buffer representation, but expecting users to
jump through hoops to get their data to look like that isn't very
user-friendly).

Decided to go with "mattr" as shorthand for "meta-attributes", similar
to "metadata".
Christopher Haster 8 năm trước cách đây
mục cha
commit
eaa9220aad
2 tập tin đã thay đổi với 230 bổ sung và 211 xóa
  1. 220 199
      lfs.c
  2. 10 12
      lfs.h

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 220 - 199
lfs.c


+ 10 - 12
lfs.h

@@ -263,7 +263,7 @@ struct lfs_attr {
 
 /// littlefs data structures ///
 typedef uint32_t lfs_tag_t;
-typedef struct lfs_entry {
+typedef struct lfs_mattr {
     lfs_tag_t tag;
     union {
         void *buffer;
@@ -278,12 +278,12 @@ typedef struct lfs_entry {
         } d;
         struct lfs_dir *dir;
     } u;
-} lfs_entry_t;
+} lfs_mattr_t;
 
-typedef struct lfs_entrylist {
-    lfs_entry_t e;
-    struct lfs_entrylist *next;
-} lfs_entrylist_t;
+typedef struct lfs_mattrlist {
+    lfs_mattr_t e;
+    struct lfs_mattrlist *next;
+} lfs_mattrlist_t;
 
 typedef struct lfs_cache {
     lfs_block_t block;
@@ -295,7 +295,6 @@ typedef struct lfs_file {
     struct lfs_file *next;
     lfs_block_t pair[2];
     uint16_t id;
-
     lfs_block_t head;
     lfs_size_t size;
 
@@ -305,12 +304,15 @@ typedef struct lfs_file {
     lfs_off_t off;
     lfs_cache_t cache;
 
-    lfs_entrylist_t *attrs;
+    lfs_mattrlist_t *attrs;
 } lfs_file_t;
 
 typedef struct lfs_dir {
     struct lfs_dir *next;
     lfs_block_t pair[2];
+    uint16_t id;
+    uint16_t pos;
+    lfs_block_t head[2];
 
     lfs_block_t tail[2];
     uint32_t rev;
@@ -321,10 +323,6 @@ typedef struct lfs_dir {
     bool split;
     bool stop_at_commit; // TODO hmmm
     int16_t moveid;
-
-    uint16_t id;
-    lfs_block_t head[2];
-    lfs_off_t pos;
 } lfs_dir_t;
 
 typedef struct lfs_superblock {

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác