Github/littlefs
1
Fork 0
Code Actions Activity

Renamed split_data -> split_name

Browse Source
This commit is contained in:
Christopher Haster
2025-02-10 16:19:35 -06:00
parent 238abdd40d
commit 3b3b8eab03
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+8 -8
View File
@@ -5333,7 +5333,7 @@ static int lfsr_btree_parent(lfs_t *lfs, const lfsr_btree_t *btree,
// extra state needed for non-terminating lfsr_btree_commit__ calls // extra state needed for non-terminating lfsr_btree_commit__ calls
typedef struct lfsr_bctx { typedef struct lfsr_bctx {
lfsr_rattr_t rattrs[4]; lfsr_rattr_t rattrs[4];
lfsr_data_t split_data; lfsr_data_t split_name;
lfsr_rbyd_t branches[2]; lfsr_rbyd_t branches[2];
} lfsr_bctx_t; } lfsr_bctx_t;
@@ -5711,7 +5711,7 @@ static int lfsr_btree_commit__(lfs_t *lfs, lfsr_btree_t *btree,
// they introduce a new name! // they introduce a new name!
lfsr_tag_t split_tag; lfsr_tag_t split_tag;
err = lfsr_rbyd_lookupnext(lfs, &sibling, 0, LFSR_TAG_NAME, err = lfsr_rbyd_lookupnext(lfs, &sibling, 0, LFSR_TAG_NAME,
NULL, &split_tag, NULL, &bctx->split_data); NULL, &split_tag, NULL, &bctx->split_name);
if (err) { if (err) {
LFS_ASSERT(err != LFS_ERR_NOENT); LFS_ASSERT(err != LFS_ERR_NOENT);
return err; return err;
@@ -5734,7 +5734,7 @@ static int lfsr_btree_commit__(lfs_t *lfs, lfsr_btree_t *btree,
if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) { if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) {
bctx->rattrs[rattr_count_++] = LFSR_RATTR_DATA( bctx->rattrs[rattr_count_++] = LFSR_RATTR_DATA(
LFSR_TAG_NAME, 0, LFSR_TAG_NAME, 0,
&bctx->split_data); &bctx->split_name);
} }
// split root? // split root?
} else { } else {
@@ -5755,7 +5755,7 @@ static int lfsr_btree_commit__(lfs_t *lfs, lfsr_btree_t *btree,
if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) { if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) {
bctx->rattrs[rattr_count_++] = LFSR_RATTR_DATA( bctx->rattrs[rattr_count_++] = LFSR_RATTR_DATA(
LFSR_TAG_NAME, 0, LFSR_TAG_NAME, 0,
&bctx->split_data); &bctx->split_name);
} }
} }
rattrs_ = bctx->rattrs; rattrs_ = bctx->rattrs;
@@ -8353,9 +8353,9 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
// //
// note we need to do this after playing out pending rattrs in // note we need to do this after playing out pending rattrs in
// case they introduce a new name! // case they introduce a new name!
lfsr_data_t split_data; lfsr_data_t split_name;
err = lfsr_rbyd_sublookup(lfs, &mdir_[1].rbyd, 0, LFSR_TAG_NAME, err = lfsr_rbyd_sublookup(lfs, &mdir_[1].rbyd, 0, LFSR_TAG_NAME,
NULL, &split_data); NULL, &split_name);
if (err) { if (err) {
LFS_ASSERT(err != LFS_ERR_NOENT); LFS_ASSERT(err != LFS_ERR_NOENT);
goto failed; goto failed;
@@ -8372,7 +8372,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
mdir_[0].rbyd.blocks, LFSR_MPTR_DSIZE), mdir_[0].rbyd.blocks, LFSR_MPTR_DSIZE),
LFSR_RATTR_DATA( LFSR_RATTR_DATA(
LFSR_TAG_NAME, +(1 << lfs->mdir_bits), LFSR_TAG_NAME, +(1 << lfs->mdir_bits),
&split_data), &split_name),
LFSR_RATTR( LFSR_RATTR(
LFSR_TAG_MDIR, 0, LFSR_TAG_MDIR, 0,
mdir_[1].rbyd.blocks, LFSR_MPTR_DSIZE))); mdir_[1].rbyd.blocks, LFSR_MPTR_DSIZE)));
@@ -8392,7 +8392,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
mdir_[0].rbyd.blocks, LFSR_MPTR_DSIZE), mdir_[0].rbyd.blocks, LFSR_MPTR_DSIZE),
LFSR_RATTR_DATA( LFSR_RATTR_DATA(
LFSR_TAG_NAME, +(1 << lfs->mdir_bits), LFSR_TAG_NAME, +(1 << lfs->mdir_bits),
&split_data), &split_name),
LFSR_RATTR( LFSR_RATTR(
LFSR_TAG_MDIR, 0, LFSR_TAG_MDIR, 0,
mdir_[1].rbyd.blocks, LFSR_MPTR_DSIZE))); mdir_[1].rbyd.blocks, LFSR_MPTR_DSIZE)));