diff --git a/lfs.c b/lfs.c index 6a7db814..51fdc8a8 100644 --- a/lfs.c +++ b/lfs.c @@ -7658,7 +7658,7 @@ static inline lfsr_mid_t lfsr_mtree_weight(lfs_t *lfs) { } // lookup mdir containing a given mid -static int lfsr_mtree_lookupleaf(lfs_t *lfs, lfsr_smid_t mid, +static int lfsr_mtree_lookup(lfs_t *lfs, lfsr_smid_t mid, lfsr_mdir_t *mdir) { // looking up mid=-1 is probably a mistake LFS_ASSERT(mid >= 0); @@ -7710,32 +7710,6 @@ static int lfsr_mtree_lookupleaf(lfs_t *lfs, lfsr_smid_t mid, } } -// TODO just drop these? revert lfsr_mtree_lookupleaf -> lfsr_mtree_lookup? -// in-mdir lookups for convenience/possible code sharing -static int lfsr_mtree_lookupnext(lfs_t *lfs, lfsr_smid_t mid, lfsr_tag_t tag, - lfsr_mdir_t *mdir, lfsr_tag_t *tag_, lfsr_data_t *data_) { - int err = lfsr_mtree_lookupleaf(lfs, mid, - mdir); - if (err) { - return err; - } - - return lfsr_mdir_lookupnext(lfs, mdir, tag, - tag_, data_); -} - -static int lfsr_mtree_lookup(lfs_t *lfs, lfsr_smid_t mid, lfsr_tag_t tag, - lfsr_mdir_t *mdir, lfsr_tag_t *tag_, lfsr_data_t *data_) { - int err = lfsr_mtree_lookupleaf(lfs, mid, - mdir); - if (err) { - return err; - } - - return lfsr_mdir_lookup(lfs, mdir, tag, - tag_, data_); -} - // this is the same as lfsr_btree_commit, but we set the inmtree flag // for debugging reasons static int lfsr_mtree_commit(lfs_t *lfs, lfsr_btree_t *mtree, @@ -9186,15 +9160,14 @@ static int lfsr_mdir_namelookup(lfs_t *lfs, const lfsr_mdir_t *mdir, // lookup names in our mtree // // if not found, rid will be the best place to insert -static int lfsr_mtree_namelookupleaf(lfs_t *lfs, +static int lfsr_mtree_namelookup(lfs_t *lfs, lfsr_did_t did, const char *name, lfs_size_t name_len, - lfsr_mdir_t *mdir) { + lfsr_mdir_t *mdir, lfsr_tag_t *tag_, lfsr_data_t *data_) { // do we only have mroot? if (lfs->mtree.weight == 0) { // treat inlined mdir as mid=0 mdir->mid = 0; lfsr_mdir_sync(mdir, &lfs->mroot); - return 0; // lookup name in actual mtree } else { @@ -9226,26 +9199,16 @@ static int lfsr_mtree_namelookupleaf(lfs_t *lfs, } // fetch mdir - return lfsr_data_fetchmdir(lfs, &data, bid-((1 << lfs->mbits)-1), + int err = lfsr_data_fetchmdir(lfs, &data, bid-((1 << lfs->mbits)-1), mdir); - } -} - -static int lfsr_mtree_namelookup(lfs_t *lfs, - lfsr_did_t did, const char *name, lfs_size_t name_len, - lfsr_mdir_t *mdir, lfsr_tag_t *tag_, lfsr_data_t *data_) { - // lookup name in our mtree - int err = lfsr_mtree_namelookupleaf(lfs, - did, name, name_len, - mdir); - if (err) { - return err; + if (err) { + return err; + } } // and lookup name in our mdir lfsr_smid_t mid; - err = lfsr_mdir_namelookup(lfs, mdir, - did, name, name_len, + int err = lfsr_mdir_namelookup(lfs, mdir, did, name, name_len, &mid, tag_, data_); if (err && err != LFS_ERR_NOENT) { return err; @@ -9555,7 +9518,7 @@ static int lfsr_mtree_traverse_(lfs_t *lfs, lfsr_traversal_t *t, // iterate over mdirs in the mtree case LFSR_TSTATE_MDIRS:; // find the next mdir - err = lfsr_mtree_lookupleaf(lfs, t->b.o.mdir.mid, + err = lfsr_mtree_lookup(lfs, t->b.o.mdir.mid, &t->b.o.mdir); if (err) { // end of mtree? guess we're done @@ -10380,7 +10343,7 @@ static int lfsr_grm_pushdid(lfs_t *lfs, lfsr_did_t did) { bookmark_mdir.mid += 1; if (lfsr_mrid(lfs, bookmark_mdir.mid) >= (lfsr_srid_t)bookmark_mdir.rbyd.weight) { - err = lfsr_mtree_lookupleaf(lfs, + err = lfsr_mtree_lookup(lfs, lfsr_mbid(lfs, bookmark_mdir.mid-1) + 1, &bookmark_mdir); if (err) { @@ -10882,7 +10845,7 @@ int lfsr_dir_read(lfs_t *lfs, lfsr_dir_t *dir, struct lfs_info *info) { // next mdir? if (lfsr_mrid(lfs, dir->o.mdir.mid) >= (lfsr_srid_t)dir->o.mdir.rbyd.weight) { - int err = lfsr_mtree_lookupleaf(lfs, + int err = lfsr_mtree_lookup(lfs, lfsr_mbid(lfs, dir->o.mdir.mid-1) + 1, &dir->o.mdir); if (err) { @@ -10955,7 +10918,7 @@ int lfsr_dir_seek(lfs_t *lfs, lfsr_dir_t *dir, lfs_soff_t off) { // next mdir? if (lfsr_mrid(lfs, dir->o.mdir.mid) >= (lfsr_srid_t)dir->o.mdir.rbyd.weight) { - int err = lfsr_mtree_lookupleaf(lfs, + int err = lfsr_mtree_lookup(lfs, lfsr_mbid(lfs, dir->o.mdir.mid-1) + 1, &dir->o.mdir); if (err) { @@ -14479,7 +14442,7 @@ static int lfsr_fs_fixgrm(lfs_t *lfs) { // find our mdir lfsr_mdir_t mdir; - int err = lfsr_mtree_lookupleaf(lfs, lfs->grm.mids[0], + int err = lfsr_mtree_lookup(lfs, lfs->grm.mids[0], &mdir); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); diff --git a/tests/test_mtree.toml b/tests/test_mtree.toml index c2f5bc8c..35bfdd95 100644 --- a/tests/test_mtree.toml +++ b/tests/test_mtree.toml @@ -186,7 +186,7 @@ code = ''' memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( LFSR_RATTR_BUF(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; @@ -205,7 +205,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -229,7 +229,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -286,13 +286,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -312,13 +312,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -395,13 +395,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -411,7 +411,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -431,13 +431,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -447,7 +447,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -497,7 +497,7 @@ code = ''' // try looking up each entry lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_data_t data; uint8_t buffer[256]; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; @@ -508,7 +508,7 @@ code = ''' sprintf(name+1, "%03x", i); mdir.mid += 1; if (lfsr_mrid(&lfs, mdir.mid) >= (lfsr_srid_t)mdir.rbyd.weight) { - lfsr_mtree_lookupleaf(&lfs, lfsr_mbid(&lfs, mdir.mid) + 1, + lfsr_mtree_lookup(&lfs, lfsr_mbid(&lfs, mdir.mid) + 1, &mdir) => 0; } lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; @@ -521,7 +521,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // try looking up each entry - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 1; for (lfs_size_t i = 0; i < N; i++) { @@ -530,7 +530,7 @@ code = ''' sprintf(name+1, "%03x", i); mdir.mid += 1; if (lfsr_mrid(&lfs, mdir.mid) >= (lfsr_srid_t)mdir.rbyd.weight) { - lfsr_mtree_lookupleaf(&lfs, lfsr_mbid(&lfs, mdir.mid) + 1, + lfsr_mtree_lookup(&lfs, lfsr_mbid(&lfs, mdir.mid) + 1, &mdir) => 0; } lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; @@ -596,7 +596,7 @@ code = ''' // try looking up each entry lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_data_t data; uint8_t buffer[256]; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; @@ -622,7 +622,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // try looking up each entry - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 1; for (lfs_size_t i = 0; i < N; i++) { @@ -705,7 +705,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -725,7 +725,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -797,7 +797,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -817,7 +817,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -880,7 +880,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -896,7 +896,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -974,7 +974,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -984,7 +984,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1000,7 +1000,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1010,7 +1010,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1088,13 +1088,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1114,13 +1114,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1213,7 +1213,7 @@ code = ''' // try looking up each entry lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_data_t data; uint8_t buffer[256]; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; @@ -1239,7 +1239,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // try looking up each entry - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 1; for (lfs_size_t i = 0; i < N; i++) { @@ -1286,7 +1286,7 @@ code = ''' memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( LFSR_RATTR_BUF(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; @@ -1301,7 +1301,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // force mdir to compact twice, this should relocate - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( @@ -1322,7 +1322,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1332,7 +1332,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(4), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; @@ -1356,7 +1356,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1366,7 +1366,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(4), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; @@ -1444,13 +1444,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1460,7 +1460,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; @@ -1480,13 +1480,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1496,7 +1496,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; @@ -1574,13 +1574,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1590,7 +1590,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; @@ -1610,13 +1610,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1626,7 +1626,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; @@ -1677,7 +1677,7 @@ code = ''' assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); // assert that our entry is still in the mroot - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1696,7 +1696,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // assert that our rattr is still in the mroot - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1772,7 +1772,7 @@ code = ''' assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); // assert that our rattr is still in the mroot - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1807,7 +1807,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // assert that our rattr is still in the mroot - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1889,7 +1889,7 @@ code = ''' assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); // assert that our entry is still in the mroot - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -1916,7 +1916,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // assert that our rattr is still in the mroot - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2011,13 +2011,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2027,7 +2027,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; @@ -2047,13 +2047,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2063,7 +2063,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; @@ -2153,13 +2153,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2169,7 +2169,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2193,13 +2193,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2209,7 +2209,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mtree_lookupleaf(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2296,7 +2296,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2316,7 +2316,7 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2355,7 +2355,7 @@ code = ''' memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( LFSR_RATTR_BUF(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; @@ -2377,7 +2377,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2401,7 +2401,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2468,13 +2468,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2494,13 +2494,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -2624,7 +2624,7 @@ code = ''' // try looking up each entry lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_data_t data; uint8_t buffer[256]; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; @@ -2650,7 +2650,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // try looking up each entry - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 1; for (lfs_size_t i = 0; i < N; i++) { @@ -3588,7 +3588,7 @@ code = ''' memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( LFSR_RATTR_BUF(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; @@ -3672,7 +3672,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(1), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -3692,7 +3692,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(1), NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -3811,13 +3811,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -3833,13 +3833,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -3977,19 +3977,19 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mtree_lookupleaf(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -4005,19 +4005,19 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our entries are still in the mtree - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mtree_lookupleaf(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (1 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mtree_lookupleaf(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (2 << lfs.mbits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -4242,7 +4242,7 @@ code = ''' // try looking up each entry lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_data_t data; uint8_t buffer[256]; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; @@ -4253,7 +4253,7 @@ code = ''' sprintf(name+1, "%03x", i); mdir.mid += 1; if (lfsr_mrid(&lfs, mdir.mid) >= (lfsr_srid_t)mdir.rbyd.weight) { - lfsr_mtree_lookupleaf(&lfs, lfsr_mbid(&lfs, mdir.mid) + 1, + lfsr_mtree_lookup(&lfs, lfsr_mbid(&lfs, mdir.mid) + 1, &mdir) => 0; } lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; @@ -4266,7 +4266,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // try looking up each entry - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 1; for (lfs_size_t i = 0; i < N; i++) { @@ -4275,7 +4275,7 @@ code = ''' sprintf(name+1, "%03x", i); mdir.mid += 1; if (lfsr_mrid(&lfs, mdir.mid) >= (lfsr_srid_t)mdir.rbyd.weight) { - lfsr_mtree_lookupleaf(&lfs, lfsr_mbid(&lfs, mdir.mid) + 1, + lfsr_mtree_lookup(&lfs, lfsr_mbid(&lfs, mdir.mid) + 1, &mdir) => 0; } lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; @@ -4406,7 +4406,7 @@ code = ''' // try looking up each entry lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_data_t data; uint8_t buffer[256]; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; @@ -4432,7 +4432,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR | M_FLAGS, CFG) => 0; // try looking up each entry - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_BOOKMARK, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 1; for (lfs_size_t i = 0; i < N; i++) { @@ -4810,7 +4810,7 @@ code = ''' assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); // assert that our entry is still in the mroot - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; @@ -4883,7 +4883,7 @@ code = ''' assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); // assert that our rattr is still in the mroot - lfsr_mtree_lookupleaf(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; + lfsr_mtree_lookup(&lfs, (0 << lfs.mbits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, NULL, &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; diff --git a/tests/test_stickynotes.toml b/tests/test_stickynotes.toml index da79309b..a80d7c45 100644 --- a/tests/test_stickynotes.toml +++ b/tests/test_stickynotes.toml @@ -7989,7 +7989,7 @@ code = ''' assert(lfsr_mtree_weight(&lfs) <= ((1+lfs_popc(BOOKENDS)) << lfs.mbits)); lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight <= 1+lfs_popc(BOOKENDS)); // check that other files are unaffected @@ -8125,7 +8125,7 @@ code = ''' assert(lfsr_mtree_weight(&lfs) <= ((1+lfs_popc(BOOKENDS)) << lfs.mbits)); lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight <= 1+lfs_popc(BOOKENDS)); // check that other files are unaffected @@ -8275,7 +8275,7 @@ code = ''' assert(lfsr_mtree_weight(&lfs) <= ((1+lfs_popc(BOOKENDS)) << lfs.mbits)); lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight <= 1+lfs_popc(BOOKENDS)); // check that other files are unaffected @@ -8431,7 +8431,7 @@ code = ''' assert(lfsr_mtree_weight(&lfs) <= ((1+lfs_popc(BOOKENDS)) << lfs.mbits)); lfsr_mdir_t mdir; - lfsr_mtree_lookupleaf(&lfs, 0, &mdir) => 0; + lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight <= 1+lfs_popc(BOOKENDS)); // check that other files are unaffected