diff --git a/lfs3.c b/lfs3.c index 4f0307d7..93ff6c1c 100644 --- a/lfs3.c +++ b/lfs3.c @@ -2792,10 +2792,9 @@ typedef struct lfs3_rheight { } lfs3_rheight_t; // needed in lfs3_rbyd_fetch_ if debugging rbyd balance -static int lfs3_rbyd_lookupnext_(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, +static lfs3_stag_t lfs3_rbyd_lookupnext_(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, lfs3_srid_t rid, lfs3_tag_t tag, - lfs3_srid_t *rid_, lfs3_tag_t *tag_, lfs3_rid_t *weight_, - lfs3_data_t *data_, + lfs3_srid_t *rid_, lfs3_rid_t *weight_, lfs3_data_t *data_, lfs3_rheight_t *rheight_); // fetch an rbyd @@ -3055,22 +3054,22 @@ static int lfs3_rbyd_fetch_(lfs3_t *lfs3, // the same height #ifdef LFS3_DBGRBYDBALANCE lfs3_srid_t rid = -1; - lfs3_tag_t tag = 0; + lfs3_stag_t tag = 0; lfs3_size_t min_height = -1; lfs3_size_t max_height = 0; lfs3_size_t min_bheight = -1; lfs3_size_t max_bheight = 0; while (true) { lfs3_rheight_t rheight; - int err = lfs3_rbyd_lookupnext_(lfs3, rbyd, + tag = lfs3_rbyd_lookupnext_(lfs3, rbyd, rid, tag+1, - &rid, &tag, NULL, NULL, + &rid, NULL, NULL, &rheight); - if (err) { - if (err == LFS3_ERR_NOENT) { + if (tag < 0) { + if (tag == LFS3_ERR_NOENT) { break; } - return err; + return tag; } // find the min/max height and bheight @@ -3140,10 +3139,9 @@ static int lfs3_rbyd_fetchck(lfs3_t *lfs3, lfs3_rbyd_t *rbyd, // our core rbyd lookup algorithm // // finds the next rid+tag such that rid_+tag_ >= rid+tag -static int lfs3_rbyd_lookupnext_(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, +static lfs3_stag_t lfs3_rbyd_lookupnext_(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, lfs3_srid_t rid, lfs3_tag_t tag, - lfs3_srid_t *rid_, lfs3_tag_t *tag_, lfs3_rid_t *weight_, - lfs3_data_t *data_, + lfs3_srid_t *rid_, lfs3_rid_t *weight_, lfs3_data_t *data_, lfs3_rheight_t *rheight_) { (void)rheight_; // these bits should be clear at this point @@ -3240,41 +3238,37 @@ static int lfs3_rbyd_lookupnext_(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, if (rid_) { *rid_ = rid__; } - if (tag_) { - *tag_ = tag__; - } if (weight_) { *weight_ = upper_rid - lower_rid; } if (data_) { *data_ = LFS3_DATA_DISK(rbyd->blocks[0], branch + d, jump); } - return 0; + return tag__; } } } // finds the next rid_+tag_ such that rid_+tag_ >= rid+tag -static int lfs3_rbyd_lookupnext(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, +static lfs3_stag_t lfs3_rbyd_lookupnext(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, lfs3_srid_t rid, lfs3_tag_t tag, - lfs3_srid_t *rid_, lfs3_tag_t *tag_, lfs3_rid_t *weight_, - lfs3_data_t *data_) { + lfs3_srid_t *rid_, lfs3_rid_t *weight_, lfs3_data_t *data_) { return lfs3_rbyd_lookupnext_(lfs3, rbyd, rid, tag, - rid_, tag_, weight_, data_, + rid_, weight_, data_, NULL); } // lookup assumes a known rid -static int lfs3_rbyd_lookup(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, +static lfs3_stag_t lfs3_rbyd_lookup(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, lfs3_srid_t rid, lfs3_tag_t tag, - lfs3_tag_t *tag_, lfs3_data_t *data_) { + lfs3_data_t *data_) { lfs3_srid_t rid__; - lfs3_tag_t tag__; - int err = lfs3_rbyd_lookupnext(lfs3, rbyd, rid, lfs3_tag_key(tag), - &rid__, &tag__, NULL, data_); - if (err) { - return err; + lfs3_stag_t tag__ = lfs3_rbyd_lookupnext(lfs3, rbyd, + rid, lfs3_tag_key(tag), + &rid__, NULL, data_); + if (tag__ < 0) { + return tag__; } // lookup finds the next-smallest tag, all we need to do is fail if it @@ -3284,10 +3278,7 @@ static int lfs3_rbyd_lookup(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, return LFS3_ERR_NOENT; } - if (tag_) { - *tag_ = tag__; - } - return 0; + return tag__; } @@ -4606,21 +4597,21 @@ static lfs3_ssize_t lfs3_rbyd_estimate(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, a_rid -= 1; } - lfs3_tag_t tag = 0; + lfs3_stag_t tag = 0; lfs3_rid_t weight = 0; lfs3_size_t dsize_ = 0; while (true) { lfs3_srid_t rid_; lfs3_rid_t weight_; lfs3_data_t data; - int err = lfs3_rbyd_lookupnext(lfs3, rbyd, + tag = lfs3_rbyd_lookupnext(lfs3, rbyd, a_rid, tag+1, - &rid_, &tag, &weight_, &data); - if (err) { - if (err == LFS3_ERR_NOENT) { + &rid_, &weight_, &data); + if (tag < 0) { + if (tag == LFS3_ERR_NOENT) { break; } - return err; + return tag; } if (rid_ > a_rid+lfs3_smax(weight_-1, 0)) { break; @@ -4686,18 +4677,18 @@ static int lfs3_rbyd_appendcompactrbyd(lfs3_t *lfs3, lfs3_rbyd_t *rbyd_, const lfs3_rbyd_t *rbyd, lfs3_srid_t start_rid, lfs3_srid_t end_rid) { // copy over tags in the rbyd in order lfs3_srid_t rid = start_rid; - lfs3_tag_t tag = 0; + lfs3_stag_t tag = 0; while (true) { lfs3_rid_t weight; lfs3_data_t data; - int err = lfs3_rbyd_lookupnext(lfs3, rbyd, + tag = lfs3_rbyd_lookupnext(lfs3, rbyd, rid, tag+1, - &rid, &tag, &weight, &data); - if (err) { - if (err == LFS3_ERR_NOENT) { + &rid, &weight, &data); + if (tag < 0) { + if (tag == LFS3_ERR_NOENT) { break; } - return err; + return tag; } // end of range? note the use of rid+1 and unsigned comparison here to // treat end_rid=-1 as "unbounded" in such a way that rid=-1 is still @@ -4707,7 +4698,7 @@ static int lfs3_rbyd_appendcompactrbyd(lfs3_t *lfs3, lfs3_rbyd_t *rbyd_, } // write the tag - err = lfs3_rbyd_appendcompactrattr(lfs3, rbyd_, LFS3_RATTR_DATA( + int err = lfs3_rbyd_appendcompactrattr(lfs3, rbyd_, LFS3_RATTR_DATA( tag, weight, &data)); if (err) { return err; @@ -4939,18 +4930,17 @@ static lfs3_scmp_t lfs3_rbyd_namelookup(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, lfs3_srid_t upper_rid = rbyd->weight; lfs3_scmp_t cmp; while (lower_rid < upper_rid) { - lfs3_tag_t tag__; lfs3_srid_t rid__; lfs3_rid_t weight__; lfs3_data_t data__; - int err = lfs3_rbyd_lookupnext(lfs3, rbyd, + lfs3_stag_t tag__ = lfs3_rbyd_lookupnext(lfs3, rbyd, // lookup ~middle rid, note we may end up in the middle // of a weighted rid with this lower_rid + (upper_rid-1-lower_rid)/2, 0, - &rid__, &tag__, &weight__, &data__); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + &rid__, &weight__, &data__); + if (tag__ < 0) { + LFS3_ASSERT(tag__ != LFS3_ERR_NOENT); + return tag__; } // if we have no name, treat this rid as always lt @@ -5261,22 +5251,21 @@ static int lfs3_btree_lookupleaf(lfs3_t *lfs3, const lfs3_btree_t *btree, // lookup our bid in the rbyd lfs3_srid_t rid__; - lfs3_tag_t tag__; lfs3_rid_t weight__; lfs3_data_t data__; - int err = lfs3_rbyd_lookupnext(lfs3, rbyd_, rid, 0, - &rid__, &tag__, &weight__, &data__); - if (err) { - return err; + lfs3_stag_t tag__ = lfs3_rbyd_lookupnext(lfs3, rbyd_, rid, 0, + &rid__, &weight__, &data__); + if (tag__ < 0) { + return tag__; } // if we found a bname, lookup the branch if (tag__ == LFS3_TAG_BNAME) { - err = lfs3_rbyd_lookup(lfs3, rbyd_, rid__, LFS3_TAG_BRANCH, - &tag__, &data__); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + tag__ = lfs3_rbyd_lookup(lfs3, rbyd_, rid__, LFS3_TAG_BRANCH, + &data__); + if (tag__ < 0) { + LFS3_ASSERT(tag__ != LFS3_ERR_NOENT); + return tag__; } } @@ -5286,7 +5275,7 @@ static int lfs3_btree_lookupleaf(lfs3_t *lfs3, const lfs3_btree_t *btree, rid -= (rid__ - (weight__-1)); // fetch the next branch - err = lfs3_data_fetchbranch(lfs3, &data__, weight__, + int err = lfs3_data_fetchbranch(lfs3, &data__, weight__, rbyd_); if (err) { return err; @@ -5353,8 +5342,16 @@ static int lfs3_btree_lookup(lfs3_t *lfs3, const lfs3_btree_t *btree, } // lookup tag in rbyd - return lfs3_rbyd_lookup(lfs3, &rbyd__, rid__, tag, - tag_, data_); + lfs3_stag_t tag__ = lfs3_rbyd_lookup(lfs3, &rbyd__, rid__, tag, + data_); + if (tag__ < 0) { + return tag__; + } + + if (tag_) { + *tag_ = tag__; + } + return 0; } #endif @@ -5373,23 +5370,22 @@ static int lfs3_btree_parent(lfs3_t *lfs3, const lfs3_btree_t *btree, while (true) { // each branch is a pair of optional name + on-disk structure lfs3_srid_t rid__; - lfs3_tag_t tag__; lfs3_rid_t weight__; lfs3_data_t data__; - int err = lfs3_rbyd_lookupnext(lfs3, rbyd_, rid, 0, - &rid__, &tag__, &weight__, &data__); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + lfs3_stag_t tag__ = lfs3_rbyd_lookupnext(lfs3, rbyd_, rid, 0, + &rid__, &weight__, &data__); + if (tag__ < 0) { + LFS3_ASSERT(tag__ != LFS3_ERR_NOENT); + return tag__; } // if we found a bname, lookup the branch if (tag__ == LFS3_TAG_BNAME) { - err = lfs3_rbyd_lookup(lfs3, rbyd_, rid__, LFS3_TAG_BRANCH, - &tag__, &data__); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + tag__ = lfs3_rbyd_lookup(lfs3, rbyd_, rid__, LFS3_TAG_BRANCH, + &data__); + if (tag__ < 0) { + LFS3_ASSERT(tag__ != LFS3_ERR_NOENT); + return tag__; } } @@ -5403,7 +5399,7 @@ static int lfs3_btree_parent(lfs3_t *lfs3, const lfs3_btree_t *btree, // fetch the next branch lfs3_rbyd_t child_; - err = lfs3_data_readbranch(lfs3, weight__, &data__, &child_); + int err = lfs3_data_readbranch(lfs3, weight__, &data__, &child_); if (err) { return err; } @@ -5648,25 +5644,24 @@ static int lfs3_btree_commit_(lfs3_t *lfs3, if (pid+1 < (lfs3_srid_t)parent.weight) { // try looking up the sibling lfs3_srid_t sibling_rid; - lfs3_tag_t sibling_tag; lfs3_rid_t sibling_weight; lfs3_data_t sibling_data; - err = lfs3_rbyd_lookupnext(lfs3, &parent, pid+1, 0, - &sibling_rid, &sibling_tag, &sibling_weight, - &sibling_data); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + lfs3_stag_t sibling_tag = lfs3_rbyd_lookupnext(lfs3, &parent, + pid+1, 0, + &sibling_rid, &sibling_weight, &sibling_data); + if (sibling_tag < 0) { + LFS3_ASSERT(sibling_tag != LFS3_ERR_NOENT); + return sibling_tag; } // if we found a bname, lookup the branch if (sibling_tag == LFS3_TAG_BNAME) { - err = lfs3_rbyd_lookup(lfs3, &parent, + sibling_tag = lfs3_rbyd_lookup(lfs3, &parent, sibling_rid, LFS3_TAG_BRANCH, - &sibling_tag, &sibling_data); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + &sibling_data); + if (sibling_tag < 0) { + LFS3_ASSERT(sibling_tag != LFS3_ERR_NOENT); + return sibling_tag; } } @@ -5696,25 +5691,24 @@ static int lfs3_btree_commit_(lfs3_t *lfs3, if (pid-(lfs3_srid_t)child.weight >= 0) { // try looking up the sibling lfs3_srid_t sibling_rid; - lfs3_tag_t sibling_tag; lfs3_rid_t sibling_weight; lfs3_data_t sibling_data; - err = lfs3_rbyd_lookupnext(lfs3, &parent, pid-child.weight, 0, - &sibling_rid, &sibling_tag, &sibling_weight, - &sibling_data); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + lfs3_stag_t sibling_tag = lfs3_rbyd_lookupnext(lfs3, &parent, + pid-child.weight, 0, + &sibling_rid, &sibling_weight, &sibling_data); + if (sibling_tag < 0) { + LFS3_ASSERT(sibling_tag != LFS3_ERR_NOENT); + return sibling_tag; } // if we found a bname, lookup the branch if (sibling_tag == LFS3_TAG_BNAME) { - err = lfs3_rbyd_lookup(lfs3, &parent, + sibling_tag = lfs3_rbyd_lookup(lfs3, &parent, sibling_rid, LFS3_TAG_BRANCH, - &sibling_tag, &sibling_data); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + &sibling_data); + if (sibling_tag < 0) { + LFS3_ASSERT(sibling_tag != LFS3_ERR_NOENT); + return sibling_tag; } } @@ -5927,12 +5921,11 @@ static int lfs3_btree_commit_(lfs3_t *lfs3, // // note we need to do this after playing out pending rattrs in case // they introduce a new name! - lfs3_tag_t split_tag; - err = lfs3_rbyd_lookupnext(lfs3, &sibling, 0, 0, - NULL, &split_tag, NULL, &bcommit->ctx.split_name); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + lfs3_stag_t split_tag = lfs3_rbyd_lookupnext(lfs3, &sibling, 0, 0, + NULL, NULL, &bcommit->ctx.split_name); + if (split_tag < 0) { + LFS3_ASSERT(split_tag != LFS3_ERR_NOENT); + return split_tag; } // prepare commit to parent, tail recursing upwards @@ -6209,12 +6202,12 @@ static lfs3_scmp_t lfs3_btree_namelookupleaf(lfs3_t *lfs3, // lookup our name in the rbyd via binary search lfs3_srid_t rid__; - lfs3_tag_t tag__; + lfs3_stag_t tag__; lfs3_rid_t weight__; lfs3_data_t data__; lfs3_scmp_t cmp = lfs3_rbyd_namelookup(lfs3, rbyd_, did, name, name_len, - &rid__, &tag__, &weight__, &data__); + &rid__, (lfs3_tag_t*)&tag__, &weight__, &data__); if (cmp < 0) { LFS3_ASSERT(cmp != LFS3_ERR_NOENT); return cmp; @@ -6222,12 +6215,12 @@ static lfs3_scmp_t lfs3_btree_namelookupleaf(lfs3_t *lfs3, // if we found a bname, lookup the branch if (tag__ == LFS3_TAG_BNAME) { - int err = lfs3_rbyd_lookup(lfs3, rbyd_, rid__, + tag__ = lfs3_rbyd_lookup(lfs3, rbyd_, rid__, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag__, &data__); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + &data__); + if (tag__ < 0) { + LFS3_ASSERT(tag__ != LFS3_ERR_NOENT); + return tag__; } } @@ -6334,22 +6327,22 @@ static int lfs3_btree_traverse(lfs3_t *lfs3, const lfs3_btree_t *btree, // descend down the tree while (true) { lfs3_srid_t rid__; - lfs3_tag_t tag__; lfs3_rid_t weight__; lfs3_data_t data__; - int err = lfs3_rbyd_lookupnext(lfs3, bt->branch, bt->rid, 0, - &rid__, &tag__, &weight__, &data__); - if (err) { - return err; + lfs3_stag_t tag__ = lfs3_rbyd_lookupnext(lfs3, bt->branch, + bt->rid, 0, + &rid__, &weight__, &data__); + if (tag__ < 0) { + return tag__; } // if we found a bname, lookup the branch if (tag__ == LFS3_TAG_BNAME) { - err = lfs3_rbyd_lookup(lfs3, bt->branch, rid__, LFS3_TAG_BRANCH, - &tag__, &data__); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + tag__ = lfs3_rbyd_lookup(lfs3, bt->branch, rid__, LFS3_TAG_BRANCH, + &data__); + if (tag__ < 0) { + LFS3_ASSERT(tag__ != LFS3_ERR_NOENT); + return tag__; } } @@ -6359,7 +6352,7 @@ static int lfs3_btree_traverse(lfs3_t *lfs3, const lfs3_btree_t *btree, bt->rid -= (rid__ - (weight__-1)); // fetch the next branch - err = lfs3_data_fetchbranch(lfs3, &data__, weight__, + int err = lfs3_data_fetchbranch(lfs3, &data__, weight__, &bt->rbyd); if (err) { return err; @@ -7598,15 +7591,15 @@ static int lfs3_rbyd_appendgdelta(lfs3_t *lfs3, lfs3_rbyd_t *rbyd) { if (lfs3_memlen(grmdelta_, LFS3_GRM_DSIZE) != 0) { // make sure to xor any existing delta lfs3_data_t data; - int err = lfs3_rbyd_lookup(lfs3, rbyd, -1, LFS3_TAG_GRMDELTA, - NULL, &data); - if (err && err != LFS3_ERR_NOENT) { - return err; + lfs3_stag_t tag = lfs3_rbyd_lookup(lfs3, rbyd, -1, LFS3_TAG_GRMDELTA, + &data); + if (tag < 0 && tag != LFS3_ERR_NOENT) { + return tag; } uint8_t grmdelta[LFS3_GRM_DSIZE]; lfs3_memset(grmdelta, 0, LFS3_GRM_DSIZE); - if (err != LFS3_ERR_NOENT) { + if (tag != LFS3_ERR_NOENT) { lfs3_ssize_t d = lfs3_data_read(lfs3, &data, grmdelta, LFS3_GRM_DSIZE); if (d < 0) { @@ -7618,7 +7611,7 @@ static int lfs3_rbyd_appendgdelta(lfs3_t *lfs3, lfs3_rbyd_t *rbyd) { // append to our rbyd, replacing any existing delta lfs3_size_t size = lfs3_memlen(grmdelta_, LFS3_GRM_DSIZE); - err = lfs3_rbyd_appendrattr(lfs3, rbyd, -1, LFS3_RATTR_BUF( + int err = lfs3_rbyd_appendrattr(lfs3, rbyd, -1, LFS3_RATTR_BUF( // opportunistically remove this tag if delta is all zero (size == 0) ? LFS3_TAG_RM | LFS3_TAG_GRMDELTA @@ -7639,13 +7632,13 @@ static int lfs3_fs_consumegdelta(lfs3_t *lfs3, const lfs3_mdir_t *mdir) { // consume any grm deltas lfs3_data_t data; - int err = lfs3_rbyd_lookup(lfs3, &mdir->r, -1, LFS3_TAG_GRMDELTA, - NULL, &data); - if (err && err != LFS3_ERR_NOENT) { - return err; + lfs3_stag_t tag = lfs3_rbyd_lookup(lfs3, &mdir->r, -1, LFS3_TAG_GRMDELTA, + &data); + if (tag < 0 && tag != LFS3_ERR_NOENT) { + return tag; } - if (err != LFS3_ERR_NOENT) { + if (tag != LFS3_ERR_NOENT) { uint8_t grmdelta[LFS3_GRM_DSIZE]; lfs3_ssize_t d = lfs3_data_read(lfs3, &data, grmdelta, LFS3_GRM_DSIZE); if (d < 0) { @@ -7904,12 +7897,11 @@ static int lfs3_mdir_lookupnext(lfs3_t *lfs3, const lfs3_mdir_t *mdir, lfs3_tag_t tag, lfs3_tag_t *tag_, lfs3_data_t *data_) { lfs3_srid_t rid__; - lfs3_tag_t tag__; - int err = lfs3_rbyd_lookupnext(lfs3, &mdir->r, + lfs3_stag_t tag__ = lfs3_rbyd_lookupnext(lfs3, &mdir->r, lfs3_mrid(lfs3, mdir->mid), tag, - &rid__, &tag__, NULL, data_); - if (err) { - return err; + &rid__, NULL, data_); + if (tag__ < 0) { + return tag__; } // this is very similar to lfs3_rbyd_lookupnext, but we error if @@ -7984,11 +7976,11 @@ static int lfs3_mtree_lookup(lfs3_t *lfs3, lfs3_smid_t mid, #ifndef LFS3_2BONLY lfs3_bid_t bid; lfs3_srid_t rid; - lfs3_tag_t tag; + lfs3_stag_t tag; lfs3_bid_t weight; lfs3_data_t data; int err = lfs3_btree_lookupleaf(lfs3, &lfs3->mtree, mid, - &bid, &mdir_->r, &rid, &tag, &weight, &data); + &bid, &mdir_->r, &rid, (lfs3_tag_t*)&tag, &weight, &data); if (err) { LFS3_ASSERT(err != LFS3_ERR_NOENT); return err; @@ -8000,11 +7992,11 @@ static int lfs3_mtree_lookup(lfs3_t *lfs3, lfs3_smid_t mid, // if we found an mname, lookup the mdir if (tag == LFS3_TAG_MNAME) { - err = lfs3_rbyd_lookup(lfs3, &mdir_->r, rid, LFS3_TAG_MDIR, - NULL, &data); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + tag = lfs3_rbyd_lookup(lfs3, &mdir_->r, rid, LFS3_TAG_MDIR, + &data); + if (tag < 0) { + LFS3_ASSERT(tag != LFS3_ERR_NOENT); + return tag; } } @@ -8443,19 +8435,19 @@ static lfs3_ssize_t lfs3_mdir_estimate__(lfs3_t *lfs3, const lfs3_mdir_t *mdir, a_rid -= 1; } - lfs3_tag_t tag = 0; + lfs3_stag_t tag = 0; lfs3_size_t dsize_ = 0; while (true) { lfs3_srid_t rid_; lfs3_data_t data; - int err = lfs3_rbyd_lookupnext(lfs3, &mdir->r, + tag = lfs3_rbyd_lookupnext(lfs3, &mdir->r, a_rid, tag+1, - &rid_, &tag, NULL, &data); - if (err) { - if (err == LFS3_ERR_NOENT) { + &rid_, NULL, &data); + if (tag < 0) { + if (tag == LFS3_ERR_NOENT) { break; } - return err; + return tag; } if (rid_ != a_rid) { break; @@ -8472,7 +8464,7 @@ static lfs3_ssize_t lfs3_mdir_estimate__(lfs3_t *lfs3, const lfs3_mdir_t *mdir, dsize_ += LFS3_SHRUB_DSIZE; lfs3_shrub_t shrub; - err = lfs3_data_readshrub(lfs3, mdir, &data, + int err = lfs3_data_readshrub(lfs3, mdir, &data, &shrub); if (err) { return err; @@ -8553,18 +8545,18 @@ static int lfs3_mdir_compact__(lfs3_t *lfs3, // copy over tags in the rbyd in order lfs3_srid_t rid = lfs3_smax(start_rid, -1); - lfs3_tag_t tag = 0; + lfs3_stag_t tag = 0; while (true) { lfs3_rid_t weight; lfs3_data_t data; - int err = lfs3_rbyd_lookupnext(lfs3, &mdir->r, + tag = lfs3_rbyd_lookupnext(lfs3, &mdir->r, rid, tag+1, - &rid, &tag, &weight, &data); - if (err) { - if (err == LFS3_ERR_NOENT) { + &rid, &weight, &data); + if (tag < 0) { + if (tag == LFS3_ERR_NOENT) { break; } - return err; + return tag; } // end of range? note the use of rid+1 and unsigned comparison here to // treat end_rid=-1 as "unbounded" in such a way that rid=-1 is still @@ -8577,7 +8569,7 @@ static int lfs3_mdir_compact__(lfs3_t *lfs3, // bring it along with us if (tag == LFS3_TAG_BSHRUB) { lfs3_shrub_t shrub; - err = lfs3_data_readshrub(lfs3, mdir, &data, + int err = lfs3_data_readshrub(lfs3, mdir, &data, &shrub); if (err) { return err; @@ -8601,7 +8593,7 @@ static int lfs3_mdir_compact__(lfs3_t *lfs3, } else { // write the tag - err = lfs3_rbyd_appendcompactrattr(lfs3, &mdir_->r, + int err = lfs3_rbyd_appendcompactrattr(lfs3, &mdir_->r, LFS3_RATTR_DATA(tag, weight, &data)); if (err) { LFS3_ASSERT(err != LFS3_ERR_RANGE); @@ -9035,11 +9027,12 @@ static int lfs3_mdir_commit(lfs3_t *lfs3, lfs3_mdir_t *mdir, // note we need to do this after playing out pending rattrs in // case they introduce a new name! lfs3_data_t split_name; - err = lfs3_rbyd_lookup(lfs3, &mdir_[1].r, 0, + lfs3_stag_t split_tag = lfs3_rbyd_lookup(lfs3, &mdir_[1].r, 0, LFS3_TAG_MASK8 | LFS3_TAG_NAME, - NULL, &split_name); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); + &split_name); + if (split_tag < 0) { + LFS3_ASSERT(split_tag != LFS3_ERR_NOENT); + err = split_tag; goto failed; } @@ -9529,12 +9522,12 @@ static int lfs3_mtree_namelookup(lfs3_t *lfs3, #ifndef LFS3_2BONLY lfs3_bid_t bid; lfs3_srid_t rid; - lfs3_tag_t tag; + lfs3_stag_t tag; lfs3_bid_t weight; lfs3_data_t data; lfs3_scmp_t cmp = lfs3_btree_namelookupleaf(lfs3, &lfs3->mtree, did, name, name_len, - &bid, &mdir_->r, &rid, &tag, &weight, &data); + &bid, &mdir_->r, &rid, (lfs3_tag_t*)&tag, &weight, &data); if (cmp < 0) { LFS3_ASSERT(cmp != LFS3_ERR_NOENT); return cmp; @@ -9545,11 +9538,11 @@ static int lfs3_mtree_namelookup(lfs3_t *lfs3, // if we found an mname, lookup the mdir if (tag == LFS3_TAG_MNAME) { - int err = lfs3_rbyd_lookup(lfs3, &mdir_->r, rid, LFS3_TAG_MDIR, - NULL, &data); - if (err) { - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + tag = lfs3_rbyd_lookup(lfs3, &mdir_->r, rid, LFS3_TAG_MDIR, + &data); + if (tag < 0) { + LFS3_ASSERT(tag != LFS3_ERR_NOENT); + return tag; } } @@ -10914,10 +10907,10 @@ int lfs3_rename(lfs3_t *lfs3, const char *old_path, const char *new_path) { // lookup old entry lfs3_mdir_t old_mdir; - lfs3_tag_t old_tag; + lfs3_stag_t old_tag; lfs3_did_t old_did; err = lfs3_mtree_pathlookup(lfs3, &old_path, - &old_mdir, &old_tag, &old_did); + &old_mdir, (lfs3_tag_t*)&old_tag, &old_did); if (err) { return err; } @@ -11005,11 +10998,11 @@ int lfs3_rename(lfs3_t *lfs3, const char *old_path, const char *new_path) { if (old_tag == LFS3_TAG_UNKNOWN) { // lookup the actual tag - err = lfs3_rbyd_lookup(lfs3, &old_mdir.r, + old_tag = lfs3_rbyd_lookup(lfs3, &old_mdir.r, lfs3_mrid(lfs3, old_mdir.mid), LFS3_TAG_MASK8 | LFS3_TAG_NAME, - &old_tag, NULL); - if (err) { - return err; + NULL); + if (old_tag < 0) { + return old_tag; } } @@ -13507,13 +13500,13 @@ static int lfs3_file_sync_(lfs3_t *lfs3, lfs3_file_t *file, // not created yet? need to convert to normal file } else if (lfs3_o_isuncreat(file->b.o.flags)) { // convert stickynote -> reg file - int err = lfs3_rbyd_lookup(lfs3, &file->b.o.mdir.r, + lfs3_stag_t name_tag = lfs3_rbyd_lookup(lfs3, &file->b.o.mdir.r, lfs3_mrid(lfs3, file->b.o.mdir.mid), LFS3_TAG_STICKYNOTE, - NULL, &name_data); - if (err) { + &name_data); + if (name_tag < 0) { // orphan flag but no stickynote tag? - LFS3_ASSERT(err != LFS3_ERR_NOENT); - return err; + LFS3_ASSERT(name_tag != LFS3_ERR_NOENT); + return name_tag; } rattrs[rattr_count++] = LFS3_RATTR_DATA( @@ -15620,14 +15613,15 @@ static int lfs3_mdir_mkconsistent(lfs3_t *lfs3, lfs3_mdir_t *mdir) { } // is this mid marked as a stickynote? - err = lfs3_rbyd_lookup(lfs3, &mdir->r, + lfs3_stag_t tag = lfs3_rbyd_lookup(lfs3, &mdir->r, lfs3_mrid(lfs3, mdir->mid), LFS3_TAG_STICKYNOTE, - NULL, NULL); - if (err) { - if (err == LFS3_ERR_NOENT) { + NULL); + if (tag < 0) { + if (tag == LFS3_ERR_NOENT) { mdir->mid += 1; continue; } + err = tag; goto failed; } diff --git a/tests/test_btree.toml b/tests/test_btree.toml index 5d42b852..d460856a 100644 --- a/tests/test_btree.toml +++ b/tests/test_btree.toml @@ -3100,8 +3100,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 0*DID, "aaa", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 0); assert(weight_ == 1); @@ -3110,8 +3111,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 1*DID, "aab", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_LT; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 0); assert(weight_ == 1); @@ -3165,8 +3167,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 0, "aaa", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 0); assert(weight_ == 1); @@ -3175,8 +3178,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 0, "aab", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 1); assert(weight_ == 1); @@ -3185,8 +3189,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 0, "aac", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_LT; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 1); assert(weight_ == 1); @@ -3246,8 +3251,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 0*DID, "aaa", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 0); assert(weight_ == 1); @@ -3256,8 +3262,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 1*DID, "aab", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 1); assert(weight_ == 1); @@ -3266,8 +3273,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 2*DID, "aac", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 2); assert(weight_ == 1); @@ -3276,8 +3284,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 3*DID, "aad", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_LT; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 2); assert(weight_ == 1); @@ -3337,8 +3346,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 0*DID, "aaa", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 0); assert(weight_ == 1); @@ -3347,8 +3357,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 1*DID, "aab", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 1); assert(weight_ == 1); @@ -3357,8 +3368,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 2*DID, "aac", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 2); assert(weight_ == 1); @@ -3367,8 +3379,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 3*DID, "aad", 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_LT; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == 2); assert(weight_ == 1); @@ -3444,8 +3457,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, i*DID, name, 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == i); assert(weight_ == 1); @@ -3557,8 +3571,9 @@ code = ''' for (lfs3_size_t i = 0; i < sim_size; i++) { lfs3_btree_namelookupleaf(&lfs3, &btree, 0, sim_names[i], 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == i); assert(weight_ == 1); @@ -3641,8 +3656,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, i*DID, name, 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == i*W+W-1); assert(weight_ == W); @@ -3795,8 +3811,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 0, sim_names[i], 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == weighted_bid+sim_weights[i]-1); assert(weight_ == sim_weights[i]); @@ -3979,8 +3996,9 @@ code = ''' for (lfs3_size_t i = 0; i < sim_size; i++) { lfs3_btree_namelookupleaf(&lfs3, &btree, 0, sim_names[i], 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == i); assert(weight_ == 1); @@ -4207,8 +4225,9 @@ code = ''' lfs3_btree_namelookupleaf(&lfs3, &btree, 0, sim_names[i], 3, &bid_, &rbyd_, &rid_, NULL, &weight_, NULL) => LFS3_CMP_EQ; - lfs3_rbyd_lookup(&lfs3, &rbyd_, rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, - &tag_, &data_) => 0; + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd_, + rid_, LFS3_TAG_MASK8 | LFS3_TAG_STRUCT, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(bid_ == weighted_bid+sim_weights[i]-1); assert(weight_ == sim_weights[i]); diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index 13cc8b86..90db1154 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -136,7 +136,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -148,22 +148,22 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // commit with two attributes rbyd = init_rbyd; @@ -176,32 +176,32 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // commit with two attributes, in the other direction rbyd = init_rbyd; @@ -214,32 +214,32 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_lookup] @@ -256,7 +256,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -268,22 +268,22 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // commit with two attributes rbyd = init_rbyd; @@ -297,32 +297,32 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // commit with two attributes, in the other direction rbyd = init_rbyd; @@ -336,32 +336,32 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_atomic_get] @@ -389,18 +389,20 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // commit with two attributes rbyd = init_rbyd; @@ -413,20 +415,24 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // commit with two attributes, in the other direction rbyd = init_rbyd; @@ -438,20 +444,24 @@ code = ''' LFS3_RATTR_BUF( LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_get] @@ -479,18 +489,20 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // commit with two attributes rbyd = init_rbyd; @@ -504,20 +516,24 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // commit with two attributes, in the other direction rbyd = init_rbyd; @@ -530,20 +546,24 @@ code = ''' LFS3_RATTR_BUF( LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; - lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 4; lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_bifoliate] @@ -560,7 +580,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -579,13 +599,13 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -605,13 +625,13 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -631,7 +651,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -653,13 +673,13 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -682,13 +702,13 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -708,7 +728,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -732,18 +752,18 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -768,18 +788,18 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -799,7 +819,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -826,18 +846,18 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -865,18 +885,18 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -904,18 +924,18 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -943,18 +963,18 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -974,7 +994,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -1003,23 +1023,23 @@ code = ''' "\xdd\xdd\xdd\xdd", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1049,23 +1069,23 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1095,23 +1115,23 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1141,23 +1161,23 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1177,7 +1197,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -1206,23 +1226,23 @@ code = ''' "\xdd\xdd\xdd\xdd", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1252,23 +1272,23 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1298,23 +1318,23 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1344,23 +1364,23 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1380,7 +1400,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -1414,23 +1434,23 @@ code = ''' "\xdd\xdd\xdd\xdd", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1465,23 +1485,23 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1514,23 +1534,23 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1563,23 +1583,23 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1599,7 +1619,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -1635,28 +1655,28 @@ code = ''' "\xee\xee\xee\xee", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1693,28 +1713,28 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1749,28 +1769,28 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1805,28 +1825,28 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1846,7 +1866,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -1885,28 +1905,28 @@ code = ''' "\xee\xee\xee\xee", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -1946,28 +1966,28 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -2007,28 +2027,28 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -2048,7 +2068,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2089,33 +2109,33 @@ code = ''' "\xff\xff\xff\xff", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(6), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(6), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(6)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -2155,33 +2175,33 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(6), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(6), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(6)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -2221,33 +2241,33 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(6), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(6), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(6)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -2271,7 +2291,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2313,8 +2333,8 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -2362,7 +2382,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2401,8 +2421,8 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -2444,7 +2464,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2461,32 +2481,32 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // also try the other direction rbyd = init_rbyd; @@ -2499,32 +2519,32 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_traverse] @@ -2541,7 +2561,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2559,32 +2579,32 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // also try the other direction rbyd = init_rbyd; @@ -2598,32 +2618,32 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_atomic_traverse_permutations] @@ -2644,7 +2664,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2685,14 +2705,14 @@ code = ''' tag_ = 0; rid_ = -1; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } ''' @@ -2716,7 +2736,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2755,14 +2775,14 @@ code = ''' tag_ = 0; rid_ = -1; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } ''' @@ -2788,7 +2808,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2852,8 +2872,8 @@ code = ''' // check that all tags have been updated lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 6); @@ -2903,7 +2923,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2942,8 +2962,8 @@ code = ''' = (ORDER == 0) ? i : (ORDER == 1) ? (((lfs3_size_t)-1) - i) : TEST_PRNG(&prng); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(x & 0x7f), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(x & 0x7f), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(x & 0x7f)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -2967,7 +2987,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -2983,15 +3003,15 @@ code = ''' LFS3_TAG_RM | LFS3_TAG_ATTR(1), 0))) => 0; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // commit with two attributes, remove the first one rbyd = init_rbyd; @@ -3007,32 +3027,32 @@ code = ''' LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(1), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // commit with two attributes, remove the second one rbyd = init_rbyd; @@ -3048,26 +3068,26 @@ code = ''' LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(2), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' # NOTE if we separate physical/logical block sizes we may be able to @@ -3092,7 +3112,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -3154,15 +3174,13 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; for (unsigned k = 0; k < N; k++) { - int err = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(k+1), - &rid_, &tag_, NULL, &data_); - assert(!err || err == LFS3_ERR_NOENT); + &rid_, NULL, &data_); if (k == j) { if (j == N-1) { - assert(err == LFS3_ERR_NOENT); + assert(tag_ == LFS3_ERR_NOENT); } else { - assert(err == 0); assert(tag_ == LFS3_TAG_ATTR(j+1+1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); @@ -3183,9 +3201,9 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(k+1), - &rid_, &tag_, NULL, &data_) => 0; + &rid_, NULL, &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(k+1)); assert(rid_ == -1); @@ -3245,7 +3263,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -3307,8 +3325,8 @@ code = ''' tag_ = 0; rid_ = -1; for (unsigned k = 0; k < N-1; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); if (k >= j) { assert(tag_ == LFS3_TAG_ATTR(k+1+1)); assert(rid_ == -1); @@ -3321,7 +3339,7 @@ code = ''' } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } // cleanup @@ -3343,7 +3361,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -3357,132 +3375,132 @@ code = ''' LFS3_RATTR_BUF( LFS3_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // try to remove tags that aren't there, this should do nothing lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(1), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(3), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(5), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // one last fetch to make sure nothing was broken lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_remove_again] @@ -3499,7 +3517,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -3531,212 +3549,212 @@ code = ''' LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(5), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // try to remove tags that aren't there, this should do nothing lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(1), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(3), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(5), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // try to remove the tags again, just to make sure (keep in mind // these removes still commit to the rbyd) lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(1), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(3), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_commit(&lfs3, &rbyd, -1, LFS3_RATTRS( LFS3_RATTR( LFS3_TAG_RM | LFS3_TAG_ATTR(5), 0))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // one last fetch to make sure nothing was broken lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_remove_all] @@ -3753,7 +3771,6 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -3769,15 +3786,15 @@ code = ''' LFS3_TAG_RM | LFS3_TAG_ATTR(1), 0))) => 0; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // commit with two attributes, remove both rbyd = init_rbyd; @@ -3796,15 +3813,15 @@ code = ''' LFS3_TAG_RM | LFS3_TAG_ATTR(2), 0))) => 0; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // commit with two attributes, remove both in the other order rbyd = init_rbyd; @@ -3823,15 +3840,15 @@ code = ''' LFS3_TAG_RM | LFS3_TAG_ATTR(1), 0))) => 0; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' # NOTE if we separate physical/logical block sizes we may be able to @@ -3856,7 +3873,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; @@ -3920,7 +3937,7 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } // try resuming from all tags being removed @@ -3930,14 +3947,14 @@ code = ''' "\xaa\xaa\xaa\xaa\xaa\xaa", 6))) => 0; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 6); for (unsigned j = 1; j < N; j++) { lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } // keep track of the worst size @@ -3986,6 +4003,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; + lfs3_stag_t tag; lfs3_data_t data; uint8_t buffer[4]; @@ -4053,9 +4071,9 @@ code = ''' printf("rbyd: ["); first = true; for (unsigned rattr = 0; rattr < N; rattr++) { - int err = lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(rattr), - NULL, &data); - if (!err) { + tag = lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(rattr), + &data); + if (tag >= 0) { lfs3_ssize_t size = lfs3_data_read(&lfs3, &data, buffer, 4); if (!first) { printf(", "); @@ -4067,15 +4085,15 @@ code = ''' printf("]\n"); for (unsigned rattr = 0; rattr < N; rattr++) { - int err = lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(rattr), - NULL, &data); + tag = lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(rattr), + &data); if (sim[rattr]) { - assert(err == 0); + assert(tag == LFS3_TAG_ATTR(rattr)); lfs3_ssize_t size = lfs3_data_read(&lfs3, &data, buffer, 4); assert(size == 1); assert(memcmp(&sim[rattr], buffer, 1) == 0); } else { - assert(err == LFS3_ERR_NOENT); + assert(tag == LFS3_ERR_NOENT); } } @@ -4112,13 +4130,15 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); @@ -4134,19 +4154,23 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); @@ -4165,25 +4189,31 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); ''' @@ -4214,13 +4244,15 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); @@ -4237,19 +4269,23 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); @@ -4266,19 +4302,23 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); @@ -4299,25 +4339,31 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); @@ -4338,25 +4384,31 @@ code = ''' "\xaa\xaa\xaa\xaa", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); @@ -4377,25 +4429,31 @@ code = ''' "\xbb\xbb\xbb\xbb", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); ''' @@ -4475,7 +4533,8 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } @@ -4516,7 +4575,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -4535,44 +4594,48 @@ code = ''' LFS3_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_create_traverse] @@ -4589,7 +4652,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -4609,44 +4672,48 @@ code = ''' LFS3_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // also try the other direction rbyd = init_rbyd; @@ -4660,44 +4727,48 @@ code = ''' LFS3_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_create_traverse_permutations] @@ -4728,7 +4799,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -4777,18 +4848,19 @@ code = ''' tag_ = 0; rid_ = -1; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } ''' @@ -4849,13 +4921,13 @@ code = ''' // check that we can at least lookup all the tags // // note with random order we can't check that stored values reliably - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; for (uint16_t x = 0; x < rbyd.weight; x++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, x, LFS3_TAG_DATA, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, x, LFS3_TAG_DATA, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == x); assert(lfs3_data_size(data_) == 4); @@ -4894,19 +4966,23 @@ code = ''' "\xaa\xaa", 2))) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); @@ -4928,31 +5004,39 @@ code = ''' "\xbb\xbb", 2))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -4980,66 +5064,84 @@ code = ''' "\xcc\xcc", 2))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); ''' @@ -5074,19 +5176,23 @@ code = ''' "\xaa\xaa", 2))) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); @@ -5111,31 +5217,39 @@ code = ''' "\xbb\xbb", 2))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -5160,31 +5274,39 @@ code = ''' "\xaa\xaa", 2))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -5217,66 +5339,84 @@ code = ''' "\xcc\xcc", 2))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); @@ -5309,43 +5449,55 @@ code = ''' "\xaa\xaa", 2))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); @@ -5378,43 +5530,55 @@ code = ''' "\xbb\xbb", 2))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); ''' @@ -5502,13 +5666,14 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_ATTR(u+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(u+1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, names[j % 6], 2) == 0); } @@ -5550,7 +5715,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -5575,76 +5740,84 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_mixed_traverse] @@ -5661,7 +5834,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -5689,76 +5862,84 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // also try the other direction rbyd = init_rbyd; @@ -5780,76 +5961,84 @@ code = ''' LFS3_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_mixed_traverse_permutations] @@ -5881,7 +6070,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -5938,30 +6127,32 @@ code = ''' tag_ = 0; rid_ = -1; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == j); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, names[j % 6], 2) == 0); } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } ''' @@ -6066,13 +6257,14 @@ code = ''' // check that all tags have been updated lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_ATTR(u+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(u+1); lfs3_data_read(&lfs3, &data, buffer, 4) => 3; assert(memcmp(buffer, names[j % 6], 3) == 0); } @@ -6134,7 +6326,7 @@ code = ''' "\xff\xff\xff\xff", }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -6214,25 +6406,22 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; for (unsigned k = 0; k < N; k++) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - int err = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k, LFS3_TAG_ATTR(u+1), - &rid_, &tag_, NULL, &data_); - assert(!err || err == LFS3_ERR_NOENT); + &rid_, NULL, &data_); if (k == j/M && u == j%M) { if (u == M-1 && k == N-1) { - assert(err == LFS3_ERR_NOENT); + assert(tag_ == LFS3_ERR_NOENT); } else if (u == M-1) { - assert(err == 0); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k+1); assert(lfs3_data_size(data_) == 4); } else { - assert(err == 0); assert(tag_ == LFS3_TAG_ATTR(u+1+1)); assert(rid_ == k); assert(lfs3_data_size(data_) == 2); @@ -6243,7 +6432,7 @@ code = ''' assert(lfs3_data_size(data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, names[k % 6], 2) == 0); } @@ -6260,21 +6449,21 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; for (unsigned k = 0; k < N; k++) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k, LFS3_TAG_ATTR(u+1), - &rid_, &tag_, NULL, &data_) => 0; + &rid_, NULL, &data_); if (k == j/M && u == j%M) { assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == k); assert(lfs3_data_size(data_) == 3); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 3; assert(memcmp(buffer, names[k % 6], 3) == 0); } else { @@ -6283,7 +6472,7 @@ code = ''' assert(lfs3_data_size(data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, names[k % 6], 2) == 0); } @@ -6416,13 +6605,14 @@ code = ''' // check that all tags have been removed lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_ATTR(u+1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; } } @@ -6520,20 +6710,20 @@ code = ''' // check that we can at least lookup all the tags // // note with random order we can't check that stored values reliably - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; for (uint16_t x = 0; x < rbyd.weight; x++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, x, LFS3_TAG_DATA, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, x, LFS3_TAG_DATA, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == x); assert(lfs3_data_size(data_) == 4); for (unsigned u = 0; u < M; u++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, x, LFS3_TAG_ATTR(u+1), - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, x, LFS3_TAG_ATTR(u+1), + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == x); assert(lfs3_data_size(data_) == 2); @@ -6627,12 +6817,13 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(j+1); lfs3_data_read(&lfs3, &data, buffer, 4) => 1; assert(memcmp(buffer, names[j % 6], 1) == 0); } for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } @@ -6642,29 +6833,31 @@ code = ''' lfs3_ssize_t rid_ = -1; lfs3_data_t data_; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 1; assert(memcmp(buffer, names[j % 6], 1) == 0); } for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // keep track of the worst size if (lfs3_rbyd_eoff(&rbyd) > worst_size) { @@ -6778,18 +6971,19 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { lfs3_rbyd_lookup(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(j+1); lfs3_data_read(&lfs3, &data, buffer, 4) => 1; assert(memcmp(buffer, names[j % 6], 1) == 0); } for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_ATTR(u+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(u+1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, names[j % 6], 2) == 0); } @@ -6800,41 +6994,44 @@ code = ''' lfs3_ssize_t rid_ = -1; lfs3_data_t data_; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfs3_data_size(data_) == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 1; assert(memcmp(buffer, names[j % 6], 1) == 0); } for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == j); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, names[j % 6], 2) == 0); } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; // keep track of the worst size if (lfs3_rbyd_eoff(&rbyd) > worst_size) { @@ -6892,19 +7089,21 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to delete the other rid rbyd = init_rbyd; @@ -6920,19 +7119,21 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to delete the largest of three rbyd = init_rbyd; @@ -6951,23 +7152,27 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to delete the smallest of three rbyd = init_rbyd; @@ -6986,23 +7191,27 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to delete the middle rbyd = init_rbyd; @@ -7021,23 +7230,27 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range] @@ -7077,29 +7290,33 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to delete the other rid rbyd = init_rbyd; @@ -7121,29 +7338,33 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to delete the largest of three rbyd = init_rbyd; @@ -7171,41 +7392,49 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to delete the smallest of three rbyd = init_rbyd; @@ -7233,41 +7462,49 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to delete the middle rbyd = init_rbyd; @@ -7295,41 +7532,49 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' # some additional delete range special cases @@ -7426,101 +7671,129 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -7529,107 +7802,137 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range_r] @@ -7718,89 +8021,113 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -7809,95 +8136,121 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range_y] @@ -8014,125 +8367,161 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -8141,131 +8530,169 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range_rydy] @@ -8373,119 +8800,153 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -8494,125 +8955,161 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range_rydy_backwards] @@ -8720,119 +9217,153 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -8841,125 +9372,161 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range_rydye] @@ -9068,107 +9635,137 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -9177,113 +9774,145 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range_rydye_backwards] @@ -9392,107 +10021,137 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -9501,113 +10160,145 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range_dryy] @@ -9759,149 +10450,193 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(10), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(10), + &data) => LFS3_TAG_ATTR(10); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(11), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(11), + &data) => LFS3_TAG_ATTR(11); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(12), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(12), + &data) => LFS3_TAG_ATTR(12); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(13), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(13), + &data) => LFS3_TAG_ATTR(13); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(14), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(14), + &data) => LFS3_TAG_ATTR(14); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(10), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(10), + &data) => LFS3_TAG_ATTR(10); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(11), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(11), + &data) => LFS3_TAG_ATTR(11); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(12), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(12), + &data) => LFS3_TAG_ATTR(12); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(13), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(13), + &data) => LFS3_TAG_ATTR(13); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(14), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(14), + &data) => LFS3_TAG_ATTR(14); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -9910,155 +10645,201 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(10), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(10), + &data) => LFS3_TAG_ATTR(10); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(11), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(11), + &data) => LFS3_TAG_ATTR(11); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(12), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(12), + &data) => LFS3_TAG_ATTR(12); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(13), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(13), + &data) => LFS3_TAG_ATTR(13); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(14), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(14), + &data) => LFS3_TAG_ATTR(14); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(10), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(10), + &data) => LFS3_TAG_ATTR(10); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(11), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(11), + &data) => LFS3_TAG_ATTR(11); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(12), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(12), + &data) => LFS3_TAG_ATTR(12); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(13), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(13), + &data) => LFS3_TAG_ATTR(13); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(14), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(14), + &data) => LFS3_TAG_ATTR(14); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_delete_range_dryy_backwards] @@ -10208,149 +10989,193 @@ code = ''' LFS3_RATTR(LFS3_TAG_RM, -1))) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(10), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(10), + &data) => LFS3_TAG_ATTR(10); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(11), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(11), + &data) => LFS3_TAG_ATTR(11); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(12), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(12), + &data) => LFS3_TAG_ATTR(12); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(13), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(13), + &data) => LFS3_TAG_ATTR(13); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(14), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(14), + &data) => LFS3_TAG_ATTR(14); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(10), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(10), + &data) => LFS3_TAG_ATTR(10); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(11), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(11), + &data) => LFS3_TAG_ATTR(11); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(12), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(12), + &data) => LFS3_TAG_ATTR(12); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(13), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(13), + &data) => LFS3_TAG_ATTR(13); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(14), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(14), + &data) => LFS3_TAG_ATTR(14); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try to recreate lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -10359,155 +11184,201 @@ code = ''' "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(10), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(10), + &data) => LFS3_TAG_ATTR(10); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(11), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(11), + &data) => LFS3_TAG_ATTR(11); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(12), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(12), + &data) => LFS3_TAG_ATTR(12); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(13), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(13), + &data) => LFS3_TAG_ATTR(13); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(14), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(14), + &data) => LFS3_TAG_ATTR(14); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &data) => LFS3_TAG_ATTR(1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &data) => LFS3_TAG_ATTR(2); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(3), + &data) => LFS3_TAG_ATTR(3); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(4), + &data) => LFS3_TAG_ATTR(4); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(5), + &data) => LFS3_TAG_ATTR(5); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(6), + &data) => LFS3_TAG_ATTR(6); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(7), + &data) => LFS3_TAG_ATTR(7); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(8), + &data) => LFS3_TAG_ATTR(8); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(9), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(9), + &data) => LFS3_TAG_ATTR(9); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(10), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(10), + &data) => LFS3_TAG_ATTR(10); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(11), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(11), + &data) => LFS3_TAG_ATTR(11); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(12), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(12), + &data) => LFS3_TAG_ATTR(12); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(13), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(13), + &data) => LFS3_TAG_ATTR(13); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(14), NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(14), + &data) => LFS3_TAG_ATTR(14); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 3, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' # NOTE if we separate physical/logical block sizes we may be able to @@ -10613,7 +11484,7 @@ code = ''' assert(rbyd.weight == N-1); for (unsigned k = 0; k < N-1; k++) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); @@ -10622,7 +11493,7 @@ code = ''' } } lfs3_rbyd_lookup(&lfs3, &rbyd, N-1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try recreating the rid to make sure things still work printf("--- create: %d ---\n", j); @@ -10637,12 +11508,12 @@ code = ''' for (unsigned k = 0; k < N; k++) { if (k == j) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -10785,7 +11656,7 @@ code = ''' assert(rbyd.weight == N-1); for (unsigned k = 0; k < N-1; k++) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); @@ -10795,7 +11666,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_ATTR(u+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(u+1); lfs3_data_read(&lfs3, &data, buffer, 4) => 2; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 2) == 0); @@ -10805,9 +11676,9 @@ code = ''' } } lfs3_rbyd_lookup(&lfs3, &rbyd, N-1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, N-1, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try recreating the rid to make sure things still work printf("--- create: %d ---\n", j); @@ -10828,25 +11699,25 @@ code = ''' for (unsigned k = 0; k < N; k++) { if (k == j) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); for (unsigned u = 0; u < M; u++) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_ATTR(u+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(u+1); lfs3_data_read(&lfs3, &data, buffer, 6) => 3; assert(memcmp(buffer, names[k % 6], 3) == 0); } } else { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_ATTR(u+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(u+1); lfs3_data_read(&lfs3, &data, buffer, 6) => 2; assert(memcmp(buffer, names[k % 6], 2) == 0); } @@ -10909,7 +11780,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -10984,13 +11855,14 @@ code = ''' tag_ = 0; rid_ = -1; for (unsigned k = 0; k < N-1; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); @@ -11000,7 +11872,7 @@ code = ''' } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } // cleanup @@ -11039,7 +11911,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_data_t data_; lfs3_data_t data; @@ -11121,13 +11993,14 @@ code = ''' tag_ = 0; rid_ = -1; for (unsigned k = 0; k < N-1; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); @@ -11136,14 +12009,14 @@ code = ''' } for (unsigned u = 0; u < M; u++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == k); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 2) == 0); @@ -11154,7 +12027,7 @@ code = ''' } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, NULL, &data_) => LFS3_ERR_NOENT; + &rid_, NULL, &data_) => LFS3_ERR_NOENT; } // cleanup @@ -11192,12 +12065,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // create and delete two ids rbyd = init_rbyd; @@ -11215,12 +12088,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // create and delete two ids in the other order rbyd = init_rbyd; @@ -11239,12 +12112,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // create and delete three ids rbyd = init_rbyd; @@ -11266,12 +12139,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // create and delete three ids in the other order rbyd = init_rbyd; @@ -11295,12 +12168,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' @@ -11335,12 +12208,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // create and delete two ids rbyd = init_rbyd; @@ -11364,12 +12237,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // create and delete two ids in the other order rbyd = init_rbyd; @@ -11394,12 +12267,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // create and delete three ids rbyd = init_rbyd; @@ -11430,12 +12303,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // create and delete three ids in the other order rbyd = init_rbyd; @@ -11468,12 +12341,12 @@ code = ''' assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; ''' # NOTE if we separate physical/logical block sizes we may be able to @@ -11579,7 +12452,7 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, LFS3_TAG_DATA, 0, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try resuming from all tags being removed lfs3_rbyd_commit(&lfs3, &rbyd, 0, LFS3_RATTRS( @@ -11590,11 +12463,12 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa\xaa\xaa", 6) == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // keep track of the worst size if (lfs3_rbyd_eoff(&rbyd) > worst_size) { @@ -11732,7 +12606,7 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // try resuming from all tags being removed lfs3_rbyd_commit(&lfs3, &rbyd, 0, LFS3_RATTRS( @@ -11749,19 +12623,20 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa\xaa\xaa", 6) == 0); for (unsigned u = 0; u < M; u++) { lfs3_rbyd_lookup(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(u+1), - NULL, &data) => 0; + &data) => LFS3_TAG_ATTR(u+1); lfs3_data_read(&lfs3, &data, buffer, 6) => 3; assert(memcmp(buffer, "\xaa\xaa\xaa", 3) == 0); } lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_DATA, - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; lfs3_rbyd_lookup(&lfs3, &rbyd, 1, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; // keep track of the worst size if (lfs3_rbyd_eoff(&rbyd) > worst_size) { @@ -11809,6 +12684,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; + lfs3_stag_t tag; lfs3_data_t data; uint8_t buffer[4]; @@ -11878,9 +12754,9 @@ code = ''' printf("]\n"); printf("rbyd: ["); for (lfs3_ssize_t rid = 0; rid < (lfs3_ssize_t)rbyd.weight; rid++) { - int err = lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_DATA, - NULL, &data); - if (!err) { + tag = lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_DATA, + &data); + if (tag >= 0) { lfs3_ssize_t size = lfs3_data_read(&lfs3, &data, buffer, 4); printf("%.*s", size, buffer); } else { @@ -11894,7 +12770,8 @@ code = ''' assert(count == rbyd.weight); for (lfs3_ssize_t rid = 0; rid < (lfs3_ssize_t)count; rid++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 1; assert(memcmp(&sim[rid], buffer, 1) == 0); } @@ -11919,7 +12796,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -11932,16 +12809,16 @@ code = ''' LFS3_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); @@ -11953,28 +12830,28 @@ code = ''' LFS3_TAG_DATA, +2, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); @@ -11986,40 +12863,40 @@ code = ''' LFS3_TAG_DATA, +3, "\xcc\xcc\xcc\xcc", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); @@ -12031,52 +12908,52 @@ code = ''' LFS3_TAG_DATA, +4, "\xdd\xdd\xdd\xdd", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); @@ -12088,64 +12965,64 @@ code = ''' LFS3_TAG_DATA, +5, "\xee\xee\xee\xee", 4))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); @@ -12166,7 +13043,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -12196,72 +13073,72 @@ code = ''' "\xee\xee\xee\xee", 4))) => 0; // traverse, finding tags and weights - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_sparse_permutations] @@ -12293,7 +13170,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -12340,15 +13217,15 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == N*W); for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } @@ -12384,7 +13261,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -12434,19 +13311,20 @@ code = ''' tag_ = 0; rid_ = -1; for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; } ''' @@ -12465,7 +13343,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -12487,52 +13365,52 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xaa\xaa", 2))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); @@ -12552,88 +13430,88 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xbb\xbb", 2))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); @@ -12653,124 +13531,124 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xcc\xcc", 2))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); @@ -12790,160 +13668,160 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xdd\xdd", 2))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); @@ -12963,196 +13841,196 @@ code = ''' LFS3_TAG_ATTR(2), 0, "\xee\xee", 2))) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); @@ -13173,7 +14051,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -13244,204 +14122,204 @@ code = ''' "\xee\xee", 2))) => 0; // traverse, finding tags and weights - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_sparse_mixed_permutations] @@ -13473,7 +14351,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -13532,34 +14410,34 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == N*W); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_ATTR(1), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == j*W+W-1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_ATTR(2), + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == j*W+W-1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, - NULL, &data) => 0; + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } @@ -13595,7 +14473,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -13657,39 +14535,40 @@ code = ''' // try traversing all tags tag_ = 0; rid_ = -1; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 9); for (unsigned j = 0; j < N; j++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == j*W+W-1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == j*W+W-1); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; } ''' @@ -13726,7 +14605,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -13798,29 +14677,33 @@ code = ''' assert(rbyd.weight == N*W+D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1+D, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1+D, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); assert(lfs3_data_size(data_) == 4); } else if (k > j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1+D, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1+D, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); } - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -13858,7 +14741,7 @@ code = ''' "\xee\xee\xee\xee\xee\xee", "\xff\xff\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -13932,39 +14815,42 @@ code = ''' assert(rbyd.weight == N*W+D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1+D, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1+D, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); assert(lfs3_data_size(data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else if (k > j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1+D, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1+D, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -14005,7 +14891,7 @@ code = ''' "\xee\xee\xee\xee\xee\xee", "\xff\xff\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -14079,55 +14965,55 @@ code = ''' assert(rbyd.weight == N*W+D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1+D, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); assert(lfs3_data_size(data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1+D, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1+D); assert(weight_ == 0); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else if (k > j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1+D, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1+D); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -14166,7 +15052,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -14238,29 +15124,33 @@ code = ''' assert(rbyd.weight == N*W-D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1-D, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1-D, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); assert(lfs3_data_size(data_) == 4); } else if (k > j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1-D, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1-D, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); } - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -14298,7 +15188,7 @@ code = ''' "\xee\xee\xee\xee\xee\xee", "\xff\xff\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -14372,39 +15262,42 @@ code = ''' assert(rbyd.weight == N*W-D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1-D, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1-D, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); assert(lfs3_data_size(data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else if (k > j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1-D, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1-D, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -14445,7 +15338,7 @@ code = ''' "\xee\xee\xee\xee\xee\xee", "\xff\xff\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -14519,55 +15412,55 @@ code = ''' assert(rbyd.weight == N*W-D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1-D, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); assert(lfs3_data_size(data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1-D, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1-D); assert(weight_ == 0); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else if (k > j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1-D, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1-D); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_ATTR(2), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -14605,7 +15498,7 @@ code = ''' "\xee\xee\xee\xee\xee\xee", "\xff\xff\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -14677,27 +15570,29 @@ code = ''' assert(rbyd.weight == (N-1)*W); for (unsigned k = 0; k < N-1; k++) { if (k >= j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -14715,27 +15610,29 @@ code = ''' assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, - NULL, &data) => 0; + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -14773,7 +15670,7 @@ code = ''' "\xee\xee\xee\xee", "\xff\xff\xff\xff", }; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -14847,21 +15744,23 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == k*W+W-1); assert(weight_ == 0); @@ -14879,20 +15778,22 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); if (k == j) { lfs3_rbyd_lookup(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_ATTR(1), - NULL, &data) => LFS3_ERR_NOENT; + &data) => LFS3_ERR_NOENT; } } @@ -14907,21 +15808,23 @@ code = ''' lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + k*W+W-1, LFS3_TAG_DATA, + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_ATTR(1), - &rid_, &tag_, &weight_, &data_) => 0; + &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == k*W+W-1); assert(weight_ == 0); @@ -14955,6 +15858,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; + lfs3_stag_t tag; lfs3_data_t data; uint8_t buffer[4]; @@ -15060,18 +15964,18 @@ code = ''' printf("]\n"); printf("rbyd: ["); for (lfs3_ssize_t rid = 0; rid < (lfs3_ssize_t)rbyd.weight; rid++) { - int err = lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_DATA, - NULL, &data); - if (!err) { + tag = lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_DATA, + &data); + if (tag >= 0) { lfs3_ssize_t size = lfs3_data_read(&lfs3, &data, buffer, 4); printf("%.*s", size, buffer); } else { printf("?"); } for (uint8_t u = 0; u < M; u++) { - err = lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_ATTR(u), - NULL, &data); - if (!err) { + tag = lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_ATTR(u), + &data); + if (tag >= 0) { lfs3_ssize_t size = lfs3_data_read(&lfs3, &data, buffer, 4); printf("%.*s", size, buffer); } else { @@ -15086,7 +15990,8 @@ code = ''' assert(count == rbyd.weight); for (lfs3_ssize_t rid = 0; rid < (lfs3_ssize_t)count; rid++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_DATA, NULL, &data) => 0; + lfs3_rbyd_lookup(&lfs3, &rbyd, rid, LFS3_TAG_DATA, + &data) => LFS3_TAG_DATA; lfs3_data_read(&lfs3, &data, buffer, 4) => 1; assert(memcmp(&sim[rid*(M+1)], buffer, 1) == 0); } @@ -15115,7 +16020,7 @@ code = ''' .weight = 0, }; lfs3_rbyd_t rbyd; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_ssize_t rid_; lfs3_size_t weight_; lfs3_data_t data_; @@ -15240,10 +16145,10 @@ code = ''' weighted_rid += sim_weights[j]; } - int err = lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, weighted_rid, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_); - if (!err) { + &rid_, &weight_, &data_); + if (tag_ >= 0) { lfs3_ssize_t size = lfs3_data_read(&lfs3, &data_, buffer, 4); if (size >= 0) { printf("%.*sw%d", size, buffer, weight_); @@ -15273,10 +16178,13 @@ code = ''' weighted_rid += sim_weights[j]; } - lfs3_rbyd_lookupnext(&lfs3, &rbyd, + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, weighted_rid, LFS3_TAG_DATA, - &rid_, &tag_, &weight_, &data_) => 0; - lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, NULL, &data) => 0; + &rid_, &weight_, &data_); + assert(tag_ >= 0); + + lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, + &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 1; assert(memcmp(&sim[rid], buffer, 1) == 0); } @@ -15365,11 +16273,11 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_data_t data_; - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; - + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, + j, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, + &data_); assert(tag_ == LFS3_TAG_ATTR((j + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 2); } @@ -15481,16 +16389,16 @@ code = ''' lfs3_size_t weight_; lfs3_data_t data_; for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); if (k != j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); @@ -15498,18 +16406,18 @@ code = ''' } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { if (k == j) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => LFS3_ERR_NOENT; + &data_) => LFS3_ERR_NOENT; } else { - lfs3_rbyd_lookup(&lfs3, &rbyd, k, + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; + &data_); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 2); } @@ -15628,15 +16536,15 @@ code = ''' lfs3_size_t weight_; lfs3_data_t data_; for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); if (k == j) { assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); @@ -15650,13 +16558,13 @@ code = ''' } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, k, + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; + &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 3); @@ -15750,11 +16658,11 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_data_t data_; - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; - + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, + j, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, + &data_); assert(tag_ == LFS3_TAG_ATTR(0x7f & (j + SHIFT))); assert(lfs3_data_size(data_) == 2); } @@ -15869,42 +16777,42 @@ code = ''' lfs3_size_t weight_; lfs3_data_t data_; for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); if (k != j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x7f & (k + SHIFT))); assert(weight_ == 0); assert(lfs3_data_size(data_) == 2); } - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x80)); assert(weight_ == 0); assert(lfs3_data_size(data_) == 1); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { if (k == j) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => LFS3_ERR_NOENT; + &data_) => LFS3_ERR_NOENT; } else { - lfs3_rbyd_lookup(&lfs3, &rbyd, k, + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; + &data_); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 2); } @@ -16026,15 +16934,15 @@ code = ''' lfs3_size_t weight_; lfs3_data_t data_; for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); if (k == j) { assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x7f & ~(k + SHIFT))); @@ -16047,21 +16955,21 @@ code = ''' assert(lfs3_data_size(data_) == 2); } - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x80)); assert(weight_ == 0); assert(lfs3_data_size(data_) == 1); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, k, + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; + &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 3); @@ -16149,11 +17057,11 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_data_t data_; - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; - + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, + j, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, + &data_); assert(tag_ == LFS3_TAG_ATTR((j + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 4); } @@ -16262,8 +17170,8 @@ code = ''' lfs3_size_t weight_; lfs3_data_t data_; for (unsigned k = 0; k < N-1; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); if (k == j) { assert(rid_ == k+1); assert(tag_ == LFS3_TAG_ATTR((k+1 + SHIFT) & 0x7f)); @@ -16282,18 +17190,18 @@ code = ''' } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { if (k == j) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => LFS3_ERR_NOENT; + &data_) => LFS3_ERR_NOENT; } else { - lfs3_rbyd_lookup(&lfs3, &rbyd, k, + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; + &data_); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 4); } @@ -16409,8 +17317,8 @@ code = ''' lfs3_size_t weight_; lfs3_data_t data_; for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); if (k == j) { assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); @@ -16424,13 +17332,13 @@ code = ''' } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, k, + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; + &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 6); @@ -16522,11 +17430,10 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_data_t data_; - lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_MASK12, - &tag_, &data_) => 0; - + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_TAG_MASK12, + &data_); assert(tag_ == LFS3_TAG_DATA); assert(lfs3_data_size(data_) == 4); } @@ -16640,15 +17547,15 @@ code = ''' lfs3_data_t data_; for (unsigned k = 0; k < N; k++) { if (k != j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == ((k == j+1) ? 2 : 1)); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); @@ -16656,18 +17563,18 @@ code = ''' } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { if (k == j) { lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => LFS3_ERR_NOENT; + &data_) => LFS3_ERR_NOENT; } else { - lfs3_rbyd_lookup(&lfs3, &rbyd, k, + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; + &data_); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 2); } @@ -16787,23 +17694,23 @@ code = ''' lfs3_data_t data_; for (unsigned k = 0; k < N; k++) { if (k == j) { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(weight_ == 1); assert(lfs3_data_size(data_) == 3); } else { - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); assert(lfs3_data_size(data_) == 4); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, + &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); @@ -16811,13 +17718,13 @@ code = ''' } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { - lfs3_rbyd_lookup(&lfs3, &rbyd, k, + tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, k, LFS3_TAG_MASK8 | LFS3_TAG_ATTR, - &tag_, &data_) => 0; + &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(lfs3_data_size(data_) == 3); @@ -16870,11 +17777,11 @@ code = ''' // can we still access things? lfs3_ssize_t rid_; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_size_t weight_; lfs3_data_t data_; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(1)); assert(weight_ == 0); @@ -16884,7 +17791,7 @@ code = ''' assert(memcmp(rbuf, "\xbb\xbb\xbb\xbb", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(1)+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_unreachable_hole_rm] @@ -16927,11 +17834,11 @@ code = ''' // can we still access things? lfs3_ssize_t rid_; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_size_t weight_; lfs3_data_t data_; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(2)); assert(weight_ == 0); @@ -16941,7 +17848,7 @@ code = ''' assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2)+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_unreachable_hole_delete] @@ -16984,11 +17891,11 @@ code = ''' // can we still access things? lfs3_ssize_t rid_; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_size_t weight_; lfs3_data_t data_; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(rid_ == 0); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); @@ -16998,7 +17905,7 @@ code = ''' assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_unreachable_hole_subwide] @@ -17042,11 +17949,11 @@ code = ''' // can we still access things? lfs3_ssize_t rid_; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_size_t weight_; lfs3_data_t data_; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(0x02)); assert(weight_ == 0); @@ -17055,8 +17962,8 @@ code = ''' lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2)+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2)+1, + &rid_, &weight_, &data_); assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(0x80)); assert(weight_ == 0); @@ -17065,7 +17972,7 @@ code = ''' assert(memcmp(rbuf, "\xdd\xdd\xdd\xdd", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(0x80)+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; ''' [cases.test_rbyd_unreachable_hole_supwide] @@ -17110,11 +18017,11 @@ code = ''' // can we still access things? lfs3_ssize_t rid_; - lfs3_tag_t tag_; + lfs3_stag_t tag_; lfs3_size_t weight_; lfs3_data_t data_; - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, 0, + &rid_, &weight_, &data_); assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(2)); assert(weight_ == 0); @@ -17123,8 +18030,8 @@ code = ''' lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); - lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2)+1, - &rid_, &tag_, &weight_, &data_) => 0; + tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2)+1, + &rid_, &weight_, &data_); assert(rid_ == 0); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); @@ -17133,6 +18040,6 @@ code = ''' assert(memcmp(rbuf, "\xdd\xdd\xdd\xdd", 4) == 0); lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA+1, - &rid_, &tag_, &weight_, &data_) => LFS3_ERR_NOENT; + &rid_, &weight_, &data_) => LFS3_ERR_NOENT; '''