Github/littlefs
1
Fork 0
Code Actions Activity

Dropped lfsr_tag_next for tag+1

Browse Source 
We were already using tag-1 several places anyways.
This commit is contained in:
Christopher Haster
2023-09-13 12:57:12 -05:00
parent 900ea807ae
commit b5c9b8eb49
2 changed files with 163 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+4 -8
View File
@@ -712,10 +712,6 @@ static inline bool lfsr_tag_istrunk(lfsr_tag_t tag) {
return (tag & 0x6000) != 0x2000; return (tag & 0x6000) != 0x2000;
} }
static inline lfsr_tag_t lfsr_tag_next(lfsr_tag_t tag) {
return tag + 0x1;
}
static inline uint8_t lfsr_tag_filetype(lfsr_tag_t tag) { static inline uint8_t lfsr_tag_filetype(lfsr_tag_t tag) {
return tag - LFSR_TAG_REG; return tag - LFSR_TAG_REG;
} }
@@ -2949,7 +2945,7 @@ static int lfsr_rbyd_appendcompactrbyd(lfs_t *lfs, lfsr_rbyd_t *rbyd_,
lfs_size_t weight; lfs_size_t weight;
lfsr_data_t data; lfsr_data_t data;
int err = lfsr_rbyd_lookupnext(lfs, rbyd, int err = lfsr_rbyd_lookupnext(lfs, rbyd,
rid, lfsr_tag_next(tag), rid, tag+1,
&rid, &tag, &weight, &data); &rid, &tag, &weight, &data);
if (err && err != LFS_ERR_NOENT) { if (err && err != LFS_ERR_NOENT) {
return err; return err;
@@ -3128,7 +3124,7 @@ static lfs_ssize_t lfsr_rbyd_estimate_(lfs_t *lfs, const lfsr_rbyd_t *rbyd,
lfs_size_t weight_; lfs_size_t weight_;
lfsr_data_t data; lfsr_data_t data;
int err = lfsr_rbyd_lookupnext(lfs, rbyd, int err = lfsr_rbyd_lookupnext(lfs, rbyd,
rid, lfsr_tag_next(tag), rid, tag+1,
&rid__, &tag, &weight_, &data); &rid__, &tag, &weight_, &data);
if (err && err != LFS_ERR_NOENT) { if (err && err != LFS_ERR_NOENT) {
return err; return err;
@@ -4989,7 +4985,7 @@ static int lfsr_mdir_commit__(lfs_t *lfs, lfsr_mdir_t *mdir,
while (true) { while (true) {
lfsr_data_t data; lfsr_data_t data;
int err = lfsr_mdir_lookupnext(lfs, mdir__, int err = lfsr_mdir_lookupnext(lfs, mdir__,
mdir__->mid, lfsr_tag_next(tag), mdir__->mid, tag+1,
&tag, &data); &tag, &data);
if (err && err != LFS_ERR_NOENT) { if (err && err != LFS_ERR_NOENT) {
return err; return err;
@@ -5593,7 +5589,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
lfs_size_t weight; lfs_size_t weight;
lfsr_data_t data; lfsr_data_t data;
int err = lfsr_rbyd_lookupnext(lfs, &mrootchild.u.r.rbyd, int err = lfsr_rbyd_lookupnext(lfs, &mrootchild.u.r.rbyd,
-1, lfsr_tag_next(tag), -1, tag+1,
&rid, &tag, &weight, &data); &rid, &tag, &weight, &data);
if (err && err != LFS_ERR_NOENT) { if (err && err != LFS_ERR_NOENT) {
return err; return err;
tests/test_rbyd.toml
+159 -159
View File
File diff suppressed because it is too large Load Diff