From 038f6b4c4b9dcd20ebc19f2539707639b4471fde Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Tue, 25 Apr 2023 15:10:15 -0500 Subject: [PATCH] Adopted more pedantic names for lookupnext/lookup The exact behavior of lfsr_rbyd_lookup is a bit unusual, and has already resulted in a few mistakes. To make this more clear at a glance, names have been changed and a few more helper functions added. The new names and expected behavior: - *_lookupnext - lookup the smallest id/tag less than or equal to the requested id/tag, returns LFS_ERR_NOENT if id/tag is greater than all ids/tags in the data structure. - *_lookup - lookup the exact id/tag, returns LFS_ERR_NOENT if id/tag is not in the data structure. These have been adopted in all current data structures: rbyd/btree/mdir - lfsr_rbyd_lookup => lfsr_rbyd_lookupnext - lfsr_btree_lookup => lfsr_btree_lookupnext - lfsr_btree_namelookup => lfsr_btree_namelookupnext - lfsr_mdir_lookup => lfsr_mdir_lookupnext Note no lfsr_btree_namelookup is added, this is a more complicated than lfsr_btree_lookup (we need to cmp the name on-disk for equality) and also probably not needed. --- lfs.c | 179 +++--- tests/test_btree.toml | 584 +++++++++----------- tests/test_rbyd.toml | 1220 +++++++++++++++++++++-------------------- 3 files changed, 988 insertions(+), 995 deletions(-) diff --git a/lfs.c b/lfs.c index 8de997b0..31b0268e 100644 --- a/lfs.c +++ b/lfs.c @@ -1794,7 +1794,7 @@ static int lfsr_rbyd_fetch(lfs_t *lfs, lfsr_rbyd_t *rbyd, return 0; } -static int lfsr_rbyd_lookup(lfs_t *lfs, const lfsr_rbyd_t *rbyd, +static int lfsr_rbyd_lookupnext(lfs_t *lfs, const lfsr_rbyd_t *rbyd, lfs_ssize_t id, lfsr_tag_t tag, lfs_ssize_t *id_, lfsr_tag_t *tag_, lfs_size_t *weight_, lfsr_data_t *data_) { @@ -1867,25 +1867,37 @@ static int lfsr_rbyd_lookup(lfs_t *lfs, const lfsr_rbyd_t *rbyd, } } -// TODO still need this? -static lfs_ssize_t lfsr_rbyd_get(lfs_t *lfs, const lfsr_rbyd_t *rbyd, - lfs_ssize_t id, lfsr_tag_t tag, void *buffer, lfs_size_t size) { +static int lfsr_rbyd_lookup(lfs_t *lfs, const lfsr_rbyd_t *rbyd, + lfs_ssize_t id, lfsr_tag_t tag, + lfsr_data_t *data_) { lfs_ssize_t id_; lfsr_tag_t tag_; - lfsr_data_t data_; - int err = lfsr_rbyd_lookup(lfs, rbyd, id, tag, - &id_, &tag_, NULL, &data_); + int err = lfsr_rbyd_lookupnext(lfs, rbyd, id, tag, + &id_, &tag_, NULL, data_); if (err) { return err; } - // lookup finds the next-smallest tag, for get, we need to fail - // if it's not an exact match + // lookup finds the next-smallest tag, all we need to do is fail if it + // picks up the wrong tag if (id_ != id || tag_ != tag) { return LFS_ERR_NOENT; } - return lfsr_data_read(lfs, data_, 0, buffer, size); + return 0; +} + +// TODO still need this? +// TODO move this into the tests? +static lfs_ssize_t lfsr_rbyd_get(lfs_t *lfs, const lfsr_rbyd_t *rbyd, + lfs_ssize_t id, lfsr_tag_t tag, void *buffer, lfs_size_t size) { + lfsr_data_t data; + int err = lfsr_rbyd_lookup(lfs, rbyd, id, tag, &data); + if (err) { + return err; + } + + return lfsr_data_read(lfs, data, 0, buffer, size); } @@ -2372,7 +2384,7 @@ static int lfsr_rbyd_append(lfs_t *lfs, lfsr_rbyd_t *rbyd, // split leaf nodes? // - // note we bias the weights here so that lfsr_rbyd_lookup + // note we bias the weights here so that lfsr_rbyd_lookupnext // always finds the next biggest tag lfsr_tag_t alt = 0; lfs_size_t weight = 0; @@ -2670,7 +2682,7 @@ static int lfsr_rbyd_cutoff(lfs_t *lfs, const lfsr_rbyd_t *rbyd, lfs_ssize_t id = -1; lfs_size_t count = 0; while (true) { - int err = lfsr_rbyd_lookup(lfs, rbyd, id+1, 0, + int err = lfsr_rbyd_lookupnext(lfs, rbyd, id+1, 0, &id, NULL, NULL, NULL); if (err && err != LFS_ERR_NOENT) { return err; @@ -2767,11 +2779,12 @@ static lfs_ssize_t lfsr_branch_fromdisk(lfs_t *lfs, lfsr_rbyd_t *branch, // B-tree operations -static lfs_ssize_t lfsr_btree_lookup(lfs_t *lfs, +// TODO should there be a different lfsr_btree_lookupnext without rbyd_/rid_? +static int lfsr_btree_lookupnext(lfs_t *lfs, const lfsr_btree_t *btree, lfs_size_t bid, lfs_size_t *bid_, lfsr_rbyd_t *rbyd_, lfs_ssize_t *rid_, - lfsr_tag_t *tag_, lfs_size_t *weight_, lfsr_data_t *data_, - bool validate) { + lfsr_tag_t *tag_, lfs_size_t *weight_, + lfsr_data_t *data_, bool validate) { // in range? if (bid >= lfsr_btree_weight(btree)) { return LFS_ERR_NOENT; @@ -2846,7 +2859,7 @@ static lfs_ssize_t lfsr_btree_lookup(lfs_t *lfs, lfsr_tag_t tag__; lfs_size_t weight__; lfsr_data_t data__; - int err = lfsr_rbyd_lookup(lfs, &branch, rid, 0, + int err = lfsr_rbyd_lookupnext(lfs, &branch, rid, 0, &rid__, &tag__, &weight__, &data__); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); @@ -2854,7 +2867,7 @@ static lfs_ssize_t lfsr_btree_lookup(lfs_t *lfs, } if (lfsr_tag_suptype(tag__) == LFSR_TAG_NAME) { - err = lfsr_rbyd_lookup(lfs, &branch, rid__, LFSR_TAG_STRUCT, + err = lfsr_rbyd_lookupnext(lfs, &branch, rid__, LFSR_TAG_STRUCT, NULL, &tag__, NULL, &data__); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); @@ -2900,7 +2913,46 @@ static lfs_ssize_t lfsr_btree_lookup(lfs_t *lfs, } } -// TODO should lfsr_btree_lookup/lfsr_btree_parent be deduplicated? +static int lfsr_btree_lookup(lfs_t *lfs, + const lfsr_btree_t *btree, lfs_size_t bid, + lfsr_tag_t *tag_, lfs_size_t *weight_, + lfsr_data_t *data_, bool validate) { + lfs_size_t bid_; + int err = lfsr_btree_lookupnext(lfs, btree, bid, + &bid_, NULL, NULL, tag_, weight_, data_, + validate); + if (err) { + return err; + } + + // lookup finds the next-smallest bid, all we need to do is fail if it + // picks up the wrong bid + if (bid_ != bid) { + return LFS_ERR_NOENT; + } + + return 0; +} + +// TODO still need this? +// TODO move this into the tests? +static int lfsr_btree_get(lfs_t *lfs, + const lfsr_btree_t *btree, lfs_size_t bid, + lfsr_tag_t *tag_, lfs_size_t *weight_, + void *buffer, lfs_size_t size, + bool validate) { + lfsr_data_t data; + int err = lfsr_btree_lookup(lfs, btree, bid, + tag_, weight_, &data, + validate); + if (err) { + return err; + } + + return lfsr_data_read(lfs, data, 0, buffer, size); +} + +// TODO should lfsr_btree_lookupnext/lfsr_btree_parent be deduplicated? static int lfsr_btree_parent(lfs_t *lfs, const lfsr_btree_t *btree, lfs_size_t bid, const lfsr_rbyd_t *child, lfsr_rbyd_t *rbyd_, lfs_ssize_t *rid_) { @@ -2921,7 +2973,7 @@ static int lfsr_btree_parent(lfs_t *lfs, lfsr_tag_t tag__; lfs_size_t weight__; lfsr_data_t data__; - int err = lfsr_rbyd_lookup(lfs, &branch, rid, 0, + int err = lfsr_rbyd_lookupnext(lfs, &branch, rid, 0, &rid__, &tag__, &weight__, &data__); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); @@ -2929,7 +2981,7 @@ static int lfsr_btree_parent(lfs_t *lfs, } if (lfsr_tag_suptype(tag__) == LFSR_TAG_NAME) { - err = lfsr_rbyd_lookup(lfs, &branch, rid__, LFSR_TAG_STRUCT, + err = lfsr_rbyd_lookupnext(lfs, &branch, rid__, LFSR_TAG_STRUCT, NULL, &tag__, NULL, &data__); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); @@ -2969,23 +3021,7 @@ static int lfsr_btree_parent(lfs_t *lfs, } } -static lfs_ssize_t lfsr_btree_get(lfs_t *lfs, - const lfsr_btree_t *btree, lfs_size_t bid, - lfs_size_t *bid_, lfsr_tag_t *tag_, lfs_size_t *weight_, - void *buffer, lfs_size_t size, - bool validate) { - lfsr_data_t data_; - int err = lfsr_btree_lookup(lfs, btree, bid, - bid_, NULL, NULL, tag_, weight_, &data_, - validate); - if (err) { - return err; - } - - return lfsr_data_read(lfs, data_, 0, buffer, size); -} - -static lfs_ssize_t lfsr_btree_namelookup(lfs_t *lfs, +static lfs_ssize_t lfsr_btree_namelookupnext(lfs_t *lfs, const lfsr_btree_t *btree, const char *name, lfs_size_t name_size, lfs_size_t *bid_, lfsr_rbyd_t *rbyd_, lfs_ssize_t *rid_, lfsr_tag_t *tag_, lfs_size_t *weight_, lfsr_data_t *data_) { @@ -3067,7 +3103,7 @@ static lfs_ssize_t lfsr_btree_namelookup(lfs_t *lfs, lfs_ssize_t rid__; lfs_size_t weight__; lfsr_data_t data__; - err = lfsr_rbyd_lookup(lfs, &branch, find.found_id, 0, + err = lfsr_rbyd_lookupnext(lfs, &branch, find.found_id, 0, &rid__, &tag__, &weight__, &data__); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); @@ -3075,7 +3111,7 @@ static lfs_ssize_t lfsr_btree_namelookup(lfs_t *lfs, } if (lfsr_tag_suptype(tag__) == LFSR_TAG_NAME) { - err = lfsr_rbyd_lookup(lfs, &branch, rid__, LFSR_TAG_STRUCT, + err = lfsr_rbyd_lookupnext(lfs, &branch, rid__, LFSR_TAG_STRUCT, NULL, &tag__, NULL, &data__); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); @@ -3121,20 +3157,6 @@ static lfs_ssize_t lfsr_btree_namelookup(lfs_t *lfs, } } -static lfs_ssize_t lfsr_btree_nameget(lfs_t *lfs, - const lfsr_btree_t *btree, const char *name, lfs_size_t name_size, - lfs_size_t *bid_, lfsr_tag_t *tag_, lfs_size_t *weight_, - void *buffer, lfs_size_t size) { - lfsr_data_t data_; - int err = lfsr_btree_namelookup(lfs, btree, name, name_size, - bid_, NULL, NULL, tag_, weight_, &data_); - if (err) { - return err; - } - - return lfsr_data_read(lfs, data_, 0, buffer, size); -} - // we need some scratch space for tail-recursive attr in lfsr_btree_commit // @@ -3238,7 +3260,7 @@ static int lfsr_btree_commit(lfs_t *lfs, lfsr_tag_t tag = 0; while (true) { lfsr_data_t data; - err = lfsr_rbyd_lookup(lfs, rbyd, id, lfsr_tag_next(tag), + err = lfsr_rbyd_lookupnext(lfs, rbyd, id, lfsr_tag_next(tag), &id, &tag, NULL, &data); if (err && err != LFS_ERR_NOENT) { return err; @@ -3369,7 +3391,8 @@ static int lfsr_btree_commit(lfs_t *lfs, lfs_ssize_t id_; lfs_size_t w_; lfsr_data_t data; - int err = lfsr_rbyd_lookup(lfs, rbyd, id, lfsr_tag_next(tag), + int err = lfsr_rbyd_lookupnext(lfs, rbyd, + id, lfsr_tag_next(tag), &id_, &tag, &w_, &data); if (err && err != LFS_ERR_NOENT) { return err; @@ -3462,7 +3485,7 @@ static int lfsr_btree_commit(lfs_t *lfs, while (true) { lfs_size_t w; lfsr_data_t data; - err = lfsr_rbyd_lookup(lfs, rbyd, id, lfsr_tag_next(tag), + err = lfsr_rbyd_lookupnext(lfs, rbyd, id, lfsr_tag_next(tag), &id, &tag, &w, &data); if (err && err != LFS_ERR_NOENT) { return err; @@ -3514,7 +3537,7 @@ static int lfsr_btree_commit(lfs_t *lfs, // they introduce a new name! lfsr_tag_t stag; lfsr_data_t sdata; - err = lfsr_rbyd_lookup(lfs, &sibling, 0, LFSR_TAG_NAME, + err = lfsr_rbyd_lookupnext(lfs, &sibling, 0, LFSR_TAG_NAME, NULL, &stag, NULL, &sdata); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); @@ -3605,7 +3628,7 @@ static int lfsr_btree_commit(lfs_t *lfs, // try looking up the sibling lfs_size_t sweight; - err = lfsr_rbyd_lookup(lfs, &parent, sid, LFSR_TAG_NAME, + err = lfsr_rbyd_lookupnext(lfs, &parent, sid, LFSR_TAG_NAME, &sid, &stag, &sweight, &sdata); if (err) { // no sibling? can't merge @@ -3616,7 +3639,7 @@ static int lfsr_btree_commit(lfs_t *lfs, } if (stag == LFSR_TAG_NAME) { - err = lfsr_rbyd_lookup(lfs, &parent, sid, LFSR_TAG_STRUCT, + err = lfsr_rbyd_lookupnext(lfs, &parent, sid, LFSR_TAG_STRUCT, NULL, &stag, NULL, &sdata); if (err) { LFS_ASSERT(err != LFS_ERR_NOENT); @@ -3641,7 +3664,7 @@ static int lfsr_btree_commit(lfs_t *lfs, while (true) { lfs_size_t w; lfsr_data_t data; - err = lfsr_rbyd_lookup(lfs, &sibling, id, lfsr_tag_next(tag), + err = lfsr_rbyd_lookupnext(lfs, &sibling, id, lfsr_tag_next(tag), &id, &tag, &w, &data); if (err && err != LFS_ERR_NOENT) { return err; @@ -3677,7 +3700,7 @@ static int lfsr_btree_commit(lfs_t *lfs, // bring in name that previously split the siblings lfsr_tag_t split_tag; lfsr_data_t split_data; - err = lfsr_rbyd_lookup(lfs, &parent, + err = lfsr_rbyd_lookupnext(lfs, &parent, (sdelta == 0 ? pid : sid), LFSR_TAG_NAME, NULL, &split_tag, NULL, &split_data); if (err) { @@ -3688,7 +3711,7 @@ static int lfsr_btree_commit(lfs_t *lfs, if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) { // lookup the id (weight really) of the previously-split entry lfs_ssize_t split_id; - err = lfsr_rbyd_lookup(lfs, &rbyd_, + err = lfsr_rbyd_lookupnext(lfs, &rbyd_, (sdelta == 0 ? sweight : rweight_), LFSR_TAG_NAME, &split_id, NULL, NULL, NULL); if (err) { @@ -3807,7 +3830,7 @@ static int lfsr_btree_push(lfs_t *lfs, lfsr_btree_t *btree, lfsr_rbyd_t rbyd = btree->root; lfs_ssize_t rid = -1; lfs_size_t rweight = 0; - int err = lfsr_btree_lookup(lfs, btree, bid_, + int err = lfsr_btree_lookupnext(lfs, btree, bid_, NULL, &rbyd, &rid, NULL, &rweight, NULL, false); if (err && err != LFS_ERR_NOENT) { @@ -3870,7 +3893,7 @@ static int lfsr_btree_update(lfs_t *lfs, lfsr_btree_t *btree, lfsr_tag_t rtag; lfs_ssize_t rid; lfs_size_t rweight; - int err = lfsr_btree_lookup(lfs, btree, bid, + int err = lfsr_btree_lookupnext(lfs, btree, bid, NULL, &rbyd, &rid, &rtag, &rweight, NULL, false); if (err) { @@ -3921,7 +3944,7 @@ static int lfsr_btree_pop(lfs_t *lfs, lfsr_btree_t *btree, lfs_size_t bid) { lfsr_tag_t rtag; lfs_ssize_t rid; lfs_size_t rweight; - int err = lfsr_btree_lookup(lfs, btree, bid, + int err = lfsr_btree_lookupnext(lfs, btree, bid, NULL, &rbyd, &rid, &rtag, &rweight, NULL, false); if (err) { @@ -3959,7 +3982,7 @@ static int lfsr_btree_pop(lfs_t *lfs, lfsr_btree_t *btree, lfs_size_t bid) { lfsr_tag_t stag; lfs_size_t sweight; lfsr_data_t sdata; - int err = lfsr_rbyd_lookup(lfs, &rbyd, sid, LFSR_TAG_NAME, + int err = lfsr_rbyd_lookupnext(lfs, &rbyd, sid, LFSR_TAG_NAME, &sid, &stag, &sweight, &sdata); if (err) { LFS_ASSERT(err == LFS_ERR_NOENT); @@ -3967,7 +3990,7 @@ static int lfsr_btree_pop(lfs_t *lfs, lfsr_btree_t *btree, lfs_size_t bid) { } if (lfsr_tag_suptype(stag) == LFSR_TAG_NAME) { - err = lfsr_rbyd_lookup(lfs, &rbyd, sid, LFSR_TAG_STRUCT, + err = lfsr_rbyd_lookupnext(lfs, &rbyd, sid, LFSR_TAG_STRUCT, NULL, &stag, NULL, &sdata); if (err) { LFS_ASSERT(err == LFS_ERR_NOENT); @@ -4041,7 +4064,7 @@ static int lfsr_btree_split(lfs_t *lfs, lfsr_btree_t *btree, lfsr_rbyd_t rbyd; lfs_ssize_t rid; lfs_size_t rweight; - int err = lfsr_btree_lookup(lfs, btree, bid, + int err = lfsr_btree_lookupnext(lfs, btree, bid, NULL, &rbyd, &rid, NULL, &rweight, NULL, false); if (err) { @@ -4169,14 +4192,22 @@ static int lfsr_mdir_fetch(lfs_t *lfs, lfsr_mdir_t *mdir, lfsr_mpair_t mpair, return 0; } -static int lfsr_mdir_lookup(lfs_t *lfs, const lfsr_mdir_t *mdir, +static int lfsr_mdir_lookupnext(lfs_t *lfs, const lfsr_mdir_t *mdir, lfs_ssize_t id, lfsr_tag_t tag, lfs_ssize_t *id_, lfsr_tag_t *tag_, lfs_size_t *weight_, lfsr_data_t *data_) { - return lfsr_rbyd_lookup(lfs, &mdir->rbyd, id, tag, + return lfsr_rbyd_lookupnext(lfs, &mdir->rbyd, id, tag, id_, tag_, weight_, data_); } +static int lfsr_mdir_lookup(lfs_t *lfs, const lfsr_mdir_t *mdir, + lfs_ssize_t id, lfsr_tag_t tag, + lfsr_data_t *data_) { + return lfsr_rbyd_lookup(lfs, &mdir->rbyd, id, tag, data_); +} + +// TODO do we need this? +// TODO move this into the tests? static lfs_ssize_t lfsr_mdir_get(lfs_t *lfs, const lfsr_mdir_t *mdir, lfs_ssize_t id, lfsr_tag_t tag, void *buffer, lfs_size_t size) { return lfsr_rbyd_get(lfs, &mdir->rbyd, id, tag, buffer, size); @@ -4215,7 +4246,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, while (true) { lfs_size_t w; lfsr_data_t data; - err = lfsr_rbyd_lookup(lfs, &mdir->rbyd, id, lfsr_tag_next(tag), + err = lfsr_rbyd_lookupnext(lfs, &mdir->rbyd, id, lfsr_tag_next(tag), &id, &tag, &w, &data); if (err && err != LFS_ERR_NOENT) { return err; @@ -4428,7 +4459,7 @@ int lfsr_mount(lfs_t *lfs, const struct lfs_config *cfg) { lfs_ssize_t id; lfsr_tag_t tag; lfsr_data_t data; - err = lfsr_mdir_lookup(lfs, &mdir, -1, LFSR_TAG_SUPERMAGIC, + err = lfsr_mdir_lookupnext(lfs, &mdir, -1, LFSR_TAG_SUPERMAGIC, &id, &tag, NULL, &data); if (err && err != LFS_ERR_NOENT) { goto failed; @@ -4456,7 +4487,7 @@ int lfsr_mount(lfs_t *lfs, const struct lfs_config *cfg) { } // lookup the superconfig - err = lfsr_mdir_lookup(lfs, &mdir, -1, LFSR_TAG_SUPERCONFIG, + err = lfsr_mdir_lookupnext(lfs, &mdir, -1, LFSR_TAG_SUPERCONFIG, &id, &tag, NULL, &data); if (err && err != LFS_ERR_NOENT) { goto failed; @@ -4506,7 +4537,7 @@ int lfsr_mount(lfs_t *lfs, const struct lfs_config *cfg) { // // if we have a supermdir, this is actually a fake superblock and // we need to parse the next superblock in the chain - err = lfsr_mdir_lookup(lfs, &mdir, -1, LFSR_TAG_SUPERMDIR, + err = lfsr_mdir_lookupnext(lfs, &mdir, -1, LFSR_TAG_SUPERMDIR, &id, &tag, NULL, &data); if (err && err != LFS_ERR_NOENT) { goto failed; diff --git a/tests/test_btree.toml b/tests/test_btree.toml index 6e0060ff..48812d75 100644 --- a/tests/test_btree.toml +++ b/tests/test_btree.toml @@ -30,11 +30,10 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -65,19 +64,17 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -109,27 +106,24 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "b", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -160,27 +154,24 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "b", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -213,35 +204,31 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "b", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 2); assert(weight_ == 1); assert(memcmp(buffer, "c", 1) == 0); lfsr_btree_get(&lfs, &btree, 3, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -273,35 +260,31 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "b", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 2); assert(weight_ == 1); assert(memcmp(buffer, "c", 1) == 0); lfsr_btree_get(&lfs, &btree, 3, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -345,22 +328,20 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < n; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, n, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -402,22 +383,20 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < n; i++) { lfsr_btree_get(&lfs, &btree, n-1-i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == n-1-i); assert(weight_ == 1); assert(memcmp(buffer, &alphas[(N-1-i) % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, n, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -499,21 +478,19 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < sim_size; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, sim_size, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // clean up sim @@ -561,38 +538,39 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < n; i++) { lfsr_btree_get(&lfs, &btree, i*W+W-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i*W+W-1); assert(weight_ == W); assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, n*W, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // also test that we can traverse the tree without prior knowledge - id_ = -1; + lfs_size_t id_ = -1; + lfsr_data_t data_; for (lfs_size_t i = 0; i < n; i++) { - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == i*W+W-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == W); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => LFS_ERR_NOENT; + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => LFS_ERR_NOENT; ''' [cases.test_btree_push_sparse_fuzz] @@ -700,7 +678,6 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space @@ -710,21 +687,21 @@ code = ''' } lfsr_btree_get(&lfs, &btree, weighted_id+sim_weights[i]-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == weighted_id+sim_weights[i]-1); assert(weight_ == sim_weights[i]); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, total_weight, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // also test that we can traverse the tree without prior knowledge - id_ = -1; + lfs_size_t id_ = -1; + lfsr_data_t data_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space lfs_size_t weighted_id = 0; @@ -732,17 +709,19 @@ code = ''' weighted_id += sim_weights[j]; } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == weighted_id+sim_weights[i]-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == sim_weights[i]); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => LFS_ERR_NOENT; + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => LFS_ERR_NOENT; // clean up sim free(sim); @@ -781,19 +760,17 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "A", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -827,27 +804,24 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "A", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "B", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -883,35 +857,31 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "A", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "B", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 2); assert(weight_ == 1); assert(memcmp(buffer, "C", 1) == 0); lfsr_btree_get(&lfs, &btree, 3, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -970,22 +940,20 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &uppers[i % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, N, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -1080,21 +1048,19 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, N, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // clean up sim @@ -1158,38 +1124,39 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_get(&lfs, &btree, i*W+W-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i*W+W-1); assert(weight_ == W); assert(memcmp(buffer, &uppers[i % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, N*W, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // also test that we can traverse the tree without prior knowledge - id_ = -1; + lfs_size_t id_ = -1; + lfsr_data_t data_; for (lfs_size_t i = 0; i < N; i++) { - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == i*W+W-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == W); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &uppers[i % 26], 1) == 0); } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => LFS_ERR_NOENT; + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => LFS_ERR_NOENT; ''' [cases.test_btree_update_sparse_fuzz] @@ -1308,7 +1275,6 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < N; i++) { // calculate actual id in btree space @@ -1318,21 +1284,21 @@ code = ''' } lfsr_btree_get(&lfs, &btree, weighted_id+sim_weights[i]-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == weighted_id+sim_weights[i]-1); assert(weight_ == sim_weights[i]); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, total_weight, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // also test that we can traverse the tree without prior knowledge - id_ = -1; + lfs_size_t id_ = -1; + lfsr_data_t data_; for (lfs_size_t i = 0; i < N; i++) { // calculate actual id in btree space lfs_size_t weighted_id = 0; @@ -1340,17 +1306,19 @@ code = ''' weighted_id += sim_weights[j]; } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == weighted_id+sim_weights[i]-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == sim_weights[i]); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => LFS_ERR_NOENT; + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => LFS_ERR_NOENT; // clean up sim free(sim); @@ -1390,11 +1358,10 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // try to putting it back to see if things still work @@ -1407,15 +1374,14 @@ code = ''' // try looking up tags lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "A", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -1448,19 +1414,17 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // try to putting it back to see if things still work @@ -1473,23 +1437,21 @@ code = ''' // try looking up tags lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "B", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -1522,19 +1484,17 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "b", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // try to putting it back to see if things still work @@ -1547,23 +1507,21 @@ code = ''' // try looking up tags lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "A", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "b", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -1597,27 +1555,24 @@ code = ''' // try looking up tags uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "b", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // try to putting it back to see if things still work @@ -1630,31 +1585,28 @@ code = ''' // try looking up tags lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "a", 1) == 0); lfsr_btree_get(&lfs, &btree, 1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 1); assert(weight_ == 1); assert(memcmp(buffer, "b", 1) == 0); lfsr_btree_get(&lfs, &btree, 2, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 2); assert(weight_ == 1); assert(memcmp(buffer, "C", 1) == 0); lfsr_btree_get(&lfs, &btree, 3, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -1714,22 +1666,20 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < REMAINING; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, REMAINING, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // try recovering @@ -1738,24 +1688,22 @@ code = ''' for (lfs_size_t i = 0; i < REMAINING; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } lfsr_btree_get(&lfs, &btree, REMAINING, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == REMAINING); assert(weight_ == 1); assert(memcmp(buffer, "R", 1) == 0); lfsr_btree_get(&lfs, &btree, REMAINING+1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -1814,22 +1762,20 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < REMAINING; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &alphas[(i+(N-REMAINING)) % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, REMAINING, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // try recovering @@ -1837,25 +1783,23 @@ code = ''' "R", 1) => 0; lfsr_btree_get(&lfs, &btree, 0, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == 0); assert(weight_ == 1); assert(memcmp(buffer, "R", 1) == 0); for (lfs_size_t i = 0; i < REMAINING; i++) { lfsr_btree_get(&lfs, &btree, i+1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i+1); assert(weight_ == 1); assert(memcmp(buffer, &alphas[(i+(N-REMAINING)) % 26], 1) == 0); } lfsr_btree_get(&lfs, &btree, REMAINING+1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -1952,21 +1896,19 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < sim_size; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, sim_size, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // clean up sim @@ -2030,22 +1972,20 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < REMAINING; i++) { lfsr_btree_get(&lfs, &btree, i*W+W-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i*W+W-1); assert(weight_ == W); assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, REMAINING*W+W-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // try recovering @@ -2054,49 +1994,52 @@ code = ''' for (lfs_size_t i = 0; i < REMAINING; i++) { lfsr_btree_get(&lfs, &btree, i*W+W-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i*W+W-1); assert(weight_ == W); assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } lfsr_btree_get(&lfs, &btree, REMAINING*W+W-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == REMAINING*W+W-1); assert(weight_ == W); assert(memcmp(buffer, "R", 1) == 0); lfsr_btree_get(&lfs, &btree, (REMAINING+1)*W+W-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // also test that we can traverse the tree without prior knowledge - id_ = -1; + lfs_size_t id_ = -1; + lfsr_data_t data_; for (lfs_size_t i = 0; i < REMAINING; i++) { - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == i*W+W-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == W); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == REMAINING*W+W-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == W); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "R", 1) == 0); - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => LFS_ERR_NOENT; + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => LFS_ERR_NOENT; ''' [cases.test_btree_pop_sparse_fuzz] @@ -2228,7 +2171,6 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space @@ -2238,21 +2180,21 @@ code = ''' } lfsr_btree_get(&lfs, &btree, weighted_id+sim_weights[i]-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == weighted_id+sim_weights[i]-1); assert(weight_ == sim_weights[i]); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, total_weight, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // also test that we can traverse the tree without prior knowledge - id_ = -1; + lfs_size_t id_ = -1; + lfsr_data_t data_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space lfs_size_t weighted_id = 0; @@ -2260,17 +2202,19 @@ code = ''' weighted_id += sim_weights[j]; } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == weighted_id+sim_weights[i]-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == sim_weights[i]); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => LFS_ERR_NOENT; + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => LFS_ERR_NOENT; // clean up sim free(sim); @@ -2320,22 +2264,20 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < n; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, n, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -2423,21 +2365,19 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < sim_size; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, sim_size, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // clean up sim @@ -2488,22 +2428,20 @@ code = ''' // check that the elements are in the tree uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < n; i++) { lfsr_btree_get(&lfs, &btree, i*W+W-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i*W+W-1); assert(weight_ == W); assert(memcmp(buffer, &alphas[i % 26], 1) == 0); } // and check that we can't lookup elements that aren't in the tree lfsr_btree_get(&lfs, &btree, n*W, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; ''' @@ -2621,7 +2559,6 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space @@ -2631,21 +2568,21 @@ code = ''' } lfsr_btree_get(&lfs, &btree, weighted_id+sim_weights[i]-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == weighted_id+sim_weights[i]-1); assert(weight_ == sim_weights[i]); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, total_weight, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // also test that we can traverse the tree without prior knowledge - id_ = -1; + lfs_size_t id_ = -1; + lfsr_data_t data_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space lfs_size_t weighted_id = 0; @@ -2653,17 +2590,19 @@ code = ''' weighted_id += sim_weights[j]; } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == weighted_id+sim_weights[i]-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == sim_weights[i]); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => LFS_ERR_NOENT; + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => LFS_ERR_NOENT; // clean up sim free(sim); @@ -2783,21 +2722,19 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < sim_size; i++) { lfsr_btree_get(&lfs, &btree, i, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == i); assert(weight_ == 1); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, sim_size, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // clean up sim @@ -2945,7 +2882,6 @@ code = ''' uint8_t buffer[4]; lfsr_tag_t tag_; - lfs_size_t id_; lfs_size_t weight_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space @@ -2955,21 +2891,21 @@ code = ''' } lfsr_btree_get(&lfs, &btree, weighted_id+sim_weights[i]-1, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => 1; assert(tag_ == LFSR_TAG_INLINED); - assert(id_ == weighted_id+sim_weights[i]-1); assert(weight_ == sim_weights[i]); assert(memcmp(buffer, &sim[i], 1) == 0); } // and no extra elements lfsr_btree_get(&lfs, &btree, total_weight, - &id_, &tag_, &weight_, + &tag_, &weight_, buffer, 4, VALIDATE) => LFS_ERR_NOENT; // also test that we can traverse the tree without prior knowledge - id_ = -1; + lfs_size_t id_ = -1; + lfsr_data_t data_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space lfs_size_t weighted_id = 0; @@ -2977,17 +2913,19 @@ code = ''' weighted_id += sim_weights[j]; } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => 1; - assert(tag_ == LFSR_TAG_INLINED); + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => 0; assert(id_ == weighted_id+sim_weights[i]-1); + assert(tag_ == LFSR_TAG_INLINED); assert(weight_ == sim_weights[i]); + + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } - lfsr_btree_get(&lfs, &btree, id_+1, - &id_, &tag_, &weight_, - buffer, 4, VALIDATE) => LFS_ERR_NOENT; + lfsr_btree_lookupnext(&lfs, &btree, id_+1, + &id_, NULL, NULL, &tag_, &weight_, + &data_, VALIDATE) => LFS_ERR_NOENT; // clean up sim free(sim); @@ -3018,14 +2956,13 @@ code = ''' assert(lfsr_btree_weight(&btree) == 0); // try to find tags - uint8_t buffer[4]; lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; - lfsr_btree_nameget(&lfs, &btree, "aaa", 3, - &id_, &tag_, &weight_, - buffer, 4) => LFS_ERR_NOENT; + lfsr_btree_namelookupnext(&lfs, &btree, "aaa", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => LFS_ERR_NOENT; ''' [cases.test_btree_find_one] @@ -3055,21 +2992,22 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; - lfsr_btree_nameget(&lfs, &btree, "aaa", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aaa", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 0); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "0", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aab", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aab", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 0); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "0", 1) == 0); ''' @@ -3103,29 +3041,30 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; - lfsr_btree_nameget(&lfs, &btree, "aaa", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aaa", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 0); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "0", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aab", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aab", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 1); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "1", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aac", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aac", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 1); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "1", 1) == 0); ''' @@ -3162,37 +3101,38 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; - lfsr_btree_nameget(&lfs, &btree, "aaa", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aaa", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 0); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "0", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aab", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aab", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 1); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "1", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aac", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aac", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 2); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "2", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aad", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aad", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 2); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "2", 1) == 0); ''' @@ -3229,37 +3169,38 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; - lfsr_btree_nameget(&lfs, &btree, "aaa", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aaa", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 0); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "0", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aab", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aab", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 1); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "1", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aac", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aac", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 2); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "2", 1) == 0); - lfsr_btree_nameget(&lfs, &btree, "aad", 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, "aad", 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == 2); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, "2", 1) == 0); ''' @@ -3309,18 +3250,19 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; for (lfs_size_t i = 0; i < n; i++) { char name[3] = { alphas[(i/26/26) % 26], alphas[(i/26) % 26], alphas[i % 26] }; - lfsr_btree_nameget(&lfs, &btree, name, 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, name, 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == i); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &nums[i % 10], 1) == 0); } ''' @@ -3428,13 +3370,14 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; for (lfs_size_t i = 0; i < sim_size; i++) { - lfsr_btree_nameget(&lfs, &btree, sim_names[i], 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, sim_names[i], 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == i); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } @@ -3492,18 +3435,19 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; for (lfs_size_t i = 0; i < n; i++) { char name[3] = { alphas[(i/26/26) % 26], alphas[(i/26) % 26], alphas[i % 26] }; - lfsr_btree_nameget(&lfs, &btree, name, 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, name, 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == i*W+W-1); assert(weight_ == W); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &nums[i % 10], 1) == 0); } ''' @@ -3644,6 +3588,7 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space lfs_size_t weighted_id = 0; @@ -3651,12 +3596,12 @@ code = ''' weighted_id += sim_weights[j]; } - lfsr_btree_nameget(&lfs, &btree, sim_names[i], 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, sim_names[i], 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == weighted_id+sim_weights[i]-1); assert(weight_ == sim_weights[i]); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } @@ -3741,9 +3686,11 @@ code = ''' // split btree lfs_size_t split_id; + lfsr_data_t split_data; + lfsr_btree_namelookupnext(&lfs, &btree, name, 3, + &split_id, NULL, NULL, NULL, NULL, &split_data) => 0; uint8_t split_buf[4]; - lfsr_btree_nameget(&lfs, &btree, name, 3, - &split_id, NULL, NULL, split_buf, 4) => 1; + lfsr_data_read(&lfs, split_data, 0, split_buf, 4) => 1; if (split_id > id) { int err = lfsr_btree_split(&lfs, &btree, split_id, sim_names[id+1], 3, @@ -3830,13 +3777,14 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; for (lfs_size_t i = 0; i < sim_size; i++) { - lfsr_btree_nameget(&lfs, &btree, sim_names[i], 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, sim_names[i], 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == i); assert(weight_ == 1); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } @@ -3937,9 +3885,12 @@ code = ''' // split btree lfs_size_t split_id; lfs_size_t split_weight; + lfsr_data_t split_data; + lfsr_btree_namelookupnext(&lfs, &btree, name, 3, + &split_id, NULL, NULL, NULL, &split_weight, + &split_data) => 0; uint8_t split_buf[4]; - lfsr_btree_nameget(&lfs, &btree, name, 3, - &split_id, NULL, &split_weight, split_buf, 4) => 1; + lfsr_data_read(&lfs, split_data, 0, split_buf, 4) => 1; if (split_id > weighted_id+sim_weights[id]-1) { int err = lfsr_btree_split(&lfs, &btree, split_id, sim_names[id+1], 3, @@ -4048,6 +3999,7 @@ code = ''' lfsr_tag_t tag_; lfs_size_t id_; lfs_size_t weight_; + lfsr_data_t data_; for (lfs_size_t i = 0; i < sim_size; i++) { // calculate actual id in btree space lfs_size_t weighted_id = 0; @@ -4055,12 +4007,12 @@ code = ''' weighted_id += sim_weights[j]; } - lfsr_btree_nameget(&lfs, &btree, sim_names[i], 3, - &id_, &tag_, &weight_, - buffer, 4) => 1; + lfsr_btree_namelookupnext(&lfs, &btree, sim_names[i], 3, + &id_, NULL, NULL, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_INLINED); assert(id_ == weighted_id+sim_weights[i]-1); assert(weight_ == sim_weights[i]); + lfsr_data_read(&lfs, data_, 0, buffer, 4) => 1; assert(memcmp(buffer, &sim[i], 1) == 0); } diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index 40e43368..bc5fb329 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -148,11 +148,11 @@ code = ''' lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, NULL, 0) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with one attribute @@ -161,21 +161,21 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes @@ -185,31 +185,31 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, in the other direction @@ -219,31 +219,31 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -271,11 +271,11 @@ code = ''' lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, NULL, 0) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with one attribute @@ -284,21 +284,21 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes @@ -309,31 +309,31 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, in the other direction @@ -344,31 +344,31 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -588,12 +588,12 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); @@ -610,12 +610,12 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); @@ -653,12 +653,12 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); @@ -676,12 +676,12 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); @@ -721,17 +721,17 @@ code = ''' LFSR_ATTR(-1, UATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); @@ -751,17 +751,17 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); @@ -802,17 +802,17 @@ code = ''' LFSR_ATTR(-1, UATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); @@ -833,17 +833,17 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); @@ -864,17 +864,17 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); @@ -895,17 +895,17 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); @@ -948,22 +948,22 @@ code = ''' LFSR_ATTR(-1, UATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -986,22 +986,22 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1024,22 +1024,22 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1062,22 +1062,22 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1120,22 +1120,22 @@ code = ''' LFSR_ATTR(-1, UATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1158,22 +1158,22 @@ code = ''' LFSR_ATTR(-1, UATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1196,22 +1196,22 @@ code = ''' LFSR_ATTR(-1, UATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1234,22 +1234,22 @@ code = ''' LFSR_ATTR(-1, UATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1295,22 +1295,22 @@ code = ''' LFSR_ATTR(-1, UATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1336,22 +1336,22 @@ code = ''' LFSR_ATTR(-1, UATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1375,22 +1375,22 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1414,22 +1414,22 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); @@ -1477,27 +1477,27 @@ code = ''' LFSR_ATTR(-1, UATTR(5), 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); @@ -1525,27 +1525,27 @@ code = ''' LFSR_ATTR(-1, UATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); @@ -1571,27 +1571,27 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); @@ -1617,27 +1617,27 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); @@ -1686,27 +1686,27 @@ code = ''' LFSR_ATTR(-1, UATTR(5), 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); @@ -1735,27 +1735,27 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); @@ -1784,27 +1784,27 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); @@ -1855,32 +1855,32 @@ code = ''' LFSR_ATTR(-1, UATTR(6), 0, "\xff\xff\xff\xff", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(6)); assert(id_ == -1); @@ -1909,32 +1909,32 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(6)); assert(id_ == -1); @@ -1963,32 +1963,32 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(5)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(6)); assert(id_ == -1); @@ -2056,7 +2056,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(j+1)); assert(id_ == -1); @@ -2144,7 +2144,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(j+1)); assert(id_ == -1); @@ -2201,31 +2201,31 @@ code = ''' LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // also try the other direction @@ -2235,31 +2235,31 @@ code = ''' LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -2292,31 +2292,31 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // also try the other direction @@ -2327,31 +2327,31 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, UATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -2415,13 +2415,13 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(j+1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } ''' @@ -2485,13 +2485,13 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(j+1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } ''' @@ -2578,7 +2578,7 @@ code = ''' // check that all tags have been updated lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(j+1)); assert(id_ == -1); @@ -2667,7 +2667,7 @@ code = ''' = (ORDER == 0) ? (uint8_t)i : (ORDER == 1) ? (uint8_t)(((lfs_size_t)-1) - i) : (uint8_t)TEST_PRNG(&prng); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(x), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(x), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(x)); assert(id_ == -1); @@ -2705,15 +2705,15 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(1), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, remove the first one @@ -2725,31 +2725,31 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(1), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, remove the second one @@ -2761,25 +2761,25 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(2), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -2866,7 +2866,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; for (unsigned k = 0; k < N; k++) { - int err = lfsr_rbyd_lookup(&lfs, &rbyd, + int err = lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(k+1), &id_, &tag_, NULL, &data_); assert(!err || err == LFS_ERR_NOENT); @@ -2896,7 +2896,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(k+1), &id_, &tag_, NULL, &data_) => 0; if (k == j) { @@ -3018,7 +3018,7 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned k = 0; k < N-1; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; if (k >= j) { assert(tag_ == LFSR_TAG_UATTR(k+1+1)); @@ -3031,7 +3031,7 @@ code = ''' } } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } @@ -3065,128 +3065,128 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, UATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), LFSR_ATTR(-1, UATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // try to remove tags that aren't there, this should do nothing lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(1), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(3), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(5), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // one last fetch to make sure nothing was broken lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -3224,205 +3224,205 @@ code = ''' LFSR_ATTR(-1, RMUATTR(3), 0, NULL, 0), LFSR_ATTR(-1, RMUATTR(5), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // try to remove tags that aren't there, this should do nothing lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(1), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(3), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(5), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // try to remove the tags again, just to make sure (keep in mind // these removes still commit to the rbyd) lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(1), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(3), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(5), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // one last fetch to make sure nothing was broken lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(4)); assert(id_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -3453,15 +3453,15 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(-1, RMUATTR(1), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, remove both @@ -3474,15 +3474,15 @@ code = ''' LFSR_ATTR(-1, RMUATTR(1), 0, NULL, 0), LFSR_ATTR(-1, RMUATTR(2), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, remove both in the other order @@ -3495,15 +3495,15 @@ code = ''' LFSR_ATTR(-1, RMUATTR(2), 0, NULL, 0), LFSR_ATTR(-1, RMUATTR(1), 0, NULL, 0))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -3588,7 +3588,7 @@ code = ''' // check that all tags are now removed lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } @@ -3598,13 +3598,13 @@ code = ''' "\xaa\xaa\xaa\xaa\xaa\xaa", 6))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == -1); assert(lfsr_data_size(data_) == 6); for (unsigned j = 1; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } @@ -4314,39 +4314,39 @@ code = ''' LFSR_ATTR(0, MKREG, +1, "\xaa\xaa\xaa\xaa", 4), LFSR_ATTR(1, MKREG, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // also try the other direction @@ -4356,39 +4356,39 @@ code = ''' LFSR_ATTR(0, MKREG, +1, "\xbb\xbb\xbb\xbb", 4), LFSR_ATTR(0, MKREG, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -4422,39 +4422,39 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(1, MKREG, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // also try the other direction @@ -4465,39 +4465,39 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(0, MKREG, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -4578,7 +4578,7 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j); @@ -4587,7 +4587,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } ''' @@ -4667,7 +4667,7 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j); @@ -4676,7 +4676,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } ''' @@ -4744,7 +4744,7 @@ code = ''' lfsr_data_t data_; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; for (uint16_t x = 0; x < rbyd.weight; x++) { - lfsr_rbyd_lookup(&lfs, &rbyd, x, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_REG, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == x); @@ -5503,67 +5503,67 @@ code = ''' LFSR_ATTR(1, MKREG, +1, "\xbb\xbb\xbb\xbb", 4), LFSR_ATTR(1, UATTR(1), 0, "\xbb\xbb", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // also try the other direction @@ -5575,67 +5575,67 @@ code = ''' LFSR_ATTR(0, MKREG, +1, "\xaa\xaa\xaa\xaa", 4), LFSR_ATTR(0, UATTR(1), 0, "\xaa\xaa", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -5673,67 +5673,67 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(1, UATTR(1), 0, "\xbb\xbb", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // also try the other direction @@ -5748,67 +5748,67 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(0, UATTR(1), 0, "\xaa\xaa", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -5896,7 +5896,7 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j); @@ -5906,7 +5906,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(u+1)); assert(id_ == j); @@ -5916,7 +5916,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 2) == 0); } } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } ''' @@ -6004,7 +6004,7 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j); @@ -6014,7 +6014,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(u+1)); assert(id_ == j); @@ -6024,7 +6024,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 2) == 0); } } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } ''' @@ -6267,7 +6267,7 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - int err = lfsr_rbyd_lookup(&lfs, &rbyd, + int err = lfsr_rbyd_lookupnext(&lfs, &rbyd, k, LFSR_TAG_UATTR(u+1), &id_, &tag_, NULL, &data_); assert(!err || err == LFS_ERR_NOENT); @@ -6308,7 +6308,7 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k, LFSR_TAG_UATTR(u+1), &id_, &tag_, NULL, &data_) => 0; if (k == j/M && u == j%M) { @@ -6556,14 +6556,14 @@ code = ''' lfsr_data_t data_; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; for (uint16_t x = 0; x < rbyd.weight; x++) { - lfsr_rbyd_lookup(&lfs, &rbyd, x, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_REG, &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == x); assert(lfsr_data_size(data_) == 4); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, x, LFSR_TAG_UATTR(u+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_UATTR(u+1), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(u+1)); assert(id_ == x); @@ -6670,7 +6670,7 @@ code = ''' lfs_ssize_t id_ = -1; lfsr_data_t data_; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(j+1)); assert(id_ == -1); @@ -6680,7 +6680,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 1) == 0); } for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j); @@ -6689,7 +6689,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // keep track of the worst size @@ -6820,7 +6820,7 @@ code = ''' lfs_ssize_t id_ = -1; lfsr_data_t data_; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(j+1)); assert(id_ == -1); @@ -6830,7 +6830,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 1) == 0); } for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j); @@ -6840,7 +6840,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(u+1)); assert(id_ == j); @@ -6850,7 +6850,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 2) == 0); } } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // keep track of the worst size @@ -7696,7 +7696,7 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned k = 0; k < N-1; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k); @@ -7710,7 +7710,7 @@ code = ''' } } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } @@ -7828,7 +7828,7 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned k = 0; k < N-1; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k); @@ -7842,7 +7842,7 @@ code = ''' } for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(u+1)); assert(id_ == k); @@ -7857,7 +7857,7 @@ code = ''' } } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } @@ -8582,7 +8582,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(0, MKREG, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); @@ -8590,7 +8590,7 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); @@ -8601,13 +8601,13 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(1, MKREG, +2, "\xbb\xbb\xbb\xbb", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); @@ -8615,13 +8615,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); @@ -8632,19 +8632,19 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(3, MKREG, +3, "\xcc\xcc\xcc\xcc", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); @@ -8652,19 +8652,19 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); @@ -8675,25 +8675,25 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(6, MKREG, +4, "\xdd\xdd\xdd\xdd", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); @@ -8701,25 +8701,25 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); @@ -8730,31 +8730,31 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS( LFSR_ATTR(10, MKREG, +5, "\xee\xee\xee\xee", 4))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 14, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 14); @@ -8762,31 +8762,31 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 14, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 14); @@ -8829,71 +8829,71 @@ code = ''' LFSR_ATTR(10, MKREG, +5, "\xee\xee\xee\xee", 4))) => 0; // traverse, finding tags and weights - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; ''' @@ -8971,7 +8971,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; assert(rbyd.weight == N*W); for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j*W+W-1); @@ -9061,7 +9061,7 @@ code = ''' tag_ = 0; id_ = -1; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j*W+W-1); @@ -9071,7 +9071,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; } ''' @@ -9106,25 +9106,25 @@ code = ''' LFSR_ATTR(0, UATTR(1), 0, "\xaa\xaa", 2), LFSR_ATTR(0, UATTR(2), 0, "\xaa\xaa", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); @@ -9132,25 +9132,25 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); @@ -9164,43 +9164,43 @@ code = ''' LFSR_ATTR(1, UNR, +1, NULL, 0), LFSR_ATTR(2, UATTR(2), 0, "\xbb\xbb", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); @@ -9208,43 +9208,43 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); @@ -9258,61 +9258,61 @@ code = ''' LFSR_ATTR(3, UNR, +2, NULL, 0), LFSR_ATTR(5, UATTR(2), 0, "\xcc\xcc", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 5); @@ -9320,61 +9320,61 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 5); @@ -9388,79 +9388,79 @@ code = ''' LFSR_ATTR(6, UNR, +3, NULL, 0), LFSR_ATTR(9, UATTR(2), 0, "\xdd\xdd", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 9); @@ -9468,79 +9468,79 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 9); @@ -9554,97 +9554,97 @@ code = ''' LFSR_ATTR(10, UNR, +4, NULL, 0), LFSR_ATTR(14, UATTR(2), 0, "\xee\xee", 2))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 14, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 14, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 14, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 14); @@ -9652,97 +9652,97 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 14, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, 14, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 14, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 14); @@ -9800,203 +9800,203 @@ code = ''' LFSR_ATTR(14, UATTR(2), 0, "\xee\xee", 2))) => 0; // traverse, finding tags and weights - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, 0, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; ''' @@ -10080,26 +10080,26 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, 0, NULL) => 0; assert(rbyd.weight == N*W); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, j*W+W-1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == j*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, j*W+W-1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == j*W+W-1); @@ -10195,14 +10195,14 @@ code = ''' // try traversing all tags tag_ = 0; id_ = -1; - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(3)); assert(id_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == j*W+W-1); @@ -10212,20 +10212,20 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == j*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == j*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); } - lfsr_rbyd_lookup(&lfs, &rbyd, id_, lfsr_tag_next(tag_), + lfsr_rbyd_lookupnext(&lfs, &rbyd, id_, lfsr_tag_next(tag_), &id_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; } ''' @@ -10332,21 +10332,21 @@ code = ''' assert(rbyd.weight == N*W+D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1+D); assert(weight_ == W+D); assert(lfsr_data_size(data_) == 4); } else if (k > j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1+D); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -10460,7 +10460,7 @@ code = ''' assert(rbyd.weight == N*W+D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1+D); @@ -10470,7 +10470,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else if (k > j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1+D); @@ -10480,7 +10480,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -10597,7 +10597,8 @@ code = ''' assert(rbyd.weight == N*W+D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1+D, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == k*W+W-1+D); @@ -10607,7 +10608,8 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1+D, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == k*W+W-1+D); @@ -10617,7 +10619,8 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else if (k > j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1+D, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == k*W+W-1+D); @@ -10627,7 +10630,8 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == k*W+W-1); @@ -10741,21 +10745,21 @@ code = ''' assert(rbyd.weight == N*W-D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1-D); assert(weight_ == W-D); assert(lfsr_data_size(data_) == 4); } else if (k > j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1-D); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -10869,7 +10873,7 @@ code = ''' assert(rbyd.weight == N*W-D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1-D); @@ -10879,7 +10883,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else if (k > j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1-D); @@ -10889,7 +10893,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -11006,7 +11010,8 @@ code = ''' assert(rbyd.weight == N*W-D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1-D, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == k*W+W-1-D); @@ -11016,7 +11021,8 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1-D, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == k*W+W-1-D); @@ -11026,7 +11032,8 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else if (k > j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1-D, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == k*W+W-1-D); @@ -11036,7 +11043,8 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1, LFSR_TAG_UATTR(2), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); assert(id_ == k*W+W-1); @@ -11149,7 +11157,7 @@ code = ''' assert(rbyd.weight == (N-1)*W); for (unsigned k = 0; k < N-1; k++) { if (k >= j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -11159,7 +11167,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 4; assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -11182,7 +11190,7 @@ code = ''' assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -11192,7 +11200,7 @@ code = ''' lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -11305,7 +11313,7 @@ code = ''' cfg->block_size, NULL) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -11316,7 +11324,8 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == k*W+W-1); @@ -11335,7 +11344,7 @@ code = ''' cfg->block_size, NULL) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -11361,7 +11370,7 @@ code = ''' cfg->block_size, NULL) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_REG); assert(id_ == k*W+W-1); @@ -11372,7 +11381,8 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, + k*W+W-1, LFSR_TAG_UATTR(1), &id_, &tag_, &weight_, &data_) => 0; assert(tag_ == LFSR_TAG_UATTR(1)); assert(id_ == k*W+W-1); @@ -11729,7 +11739,7 @@ code = ''' weighted_id += sim_weights[j]; } - int err = lfsr_rbyd_lookup(&lfs, &rbyd, + int err = lfsr_rbyd_lookupnext(&lfs, &rbyd, weighted_id, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_); if (!err) { @@ -11763,7 +11773,7 @@ code = ''' weighted_id += sim_weights[j]; } - lfsr_rbyd_lookup(&lfs, &rbyd, + lfsr_rbyd_lookupnext(&lfs, &rbyd, weighted_id, LFSR_TAG_REG, &id_, &tag_, &weight_, &data_) => 0; lfsr_rbyd_get(&lfs, &rbyd, id_, tag_, buffer, 4) => 1;