From 321e33d5d59e69f1b5694b152159eb2dc6c32074 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Mon, 1 Dec 2025 15:51:21 -0600 Subject: [PATCH] data: Adopted more object-like lfs3_data_t operations As much as I don't want to admit it, our 3-word lfs3_data_t struct is just too large to be treated as pass-by-value with today's compilers. It's a real shame, because I don't think there's a great technical reason, just that compiler's pass-by-value optimizations generally stop after 2 words. If we could expect 16-bit block sizes (off and size), we could fit in 2 words, but this is already challenged by today's NAND chips (bs>=128KiB). --- So, as a compromise, this stops treating lfs3_data_t as pass-by-value, with the exception of the lfs3_data_from* functions that still return lfs3_data_t directly. So instead of: lfs3_data_t data = lfs3_data_fromecksum(&ecksum, buffer); data = lfs3_data_slice(data, 8, -1); return lfs3_data_size(data); Most operations take lfs3_data_t by pointer: lfs3_data_t data = lfs3_data_fromecksum(&ecksum, buffer); lfs3_data_slice(&data, 8, -1); return lfs3_data_size(&data); One of the main consequences is there are now several ways to slice data (internally these all redirect to lfs3_data_slice), and LFS3_DATA_SLICE will likely see more use since we need temporary allocations to pass the data slice by address: - lfs3_data_slice(data, a, b) - Slices the data in place - lfs3_data_fromslice(data, a, b) - Returns a new data slice - LFS3_DATA_SLICE(data, a, b) - Creates a new compound-literal slice --- As a pragmatic compromise, this saves a nice chunk of both code and stack: code stack ctx before: 35316 2176 660 after: 35188 (-0.4%) 2136 (-1.8%) 660 (+0.0%) code stack ctx gbmap before: 38172 2192 772 gbmap after: 38048 (-0.3%) 2152 (-1.8%) 772 (+0.0%) --- lfs3.c | 151 +++--- tests/test_btree.toml | 4 +- tests/test_fwrite.toml | 20 +- tests/test_rbyd.toml | 1090 ++++++++++++++++++++-------------------- 4 files changed, 635 insertions(+), 630 deletions(-) diff --git a/lfs3.c b/lfs3.c index d54eaa5f..1be2706c 100644 --- a/lfs3.c +++ b/lfs3.c @@ -1521,36 +1521,36 @@ static lfs3_ssize_t lfs3_bd_progtag(lfs3_t *lfs3, .u.disk.off=_off}) // data helpers -static inline bool lfs3_data_ondisk(lfs3_data_t data) { - return data.size & LFS3_DATA_ONDISK; +static inline bool lfs3_data_ondisk(const lfs3_data_t *data) { + return data->size & LFS3_DATA_ONDISK; } -static inline bool lfs3_data_isbuf(lfs3_data_t data) { - return !(data.size & LFS3_DATA_ONDISK); +static inline bool lfs3_data_isbuf(const lfs3_data_t *data) { + return !(data->size & LFS3_DATA_ONDISK); } -static inline bool lfs3_data_isbptr(lfs3_data_t data) { - return data.size & LFS3_DATA_ISBPTR; +static inline bool lfs3_data_isbptr(const lfs3_data_t *data) { + return data->size & LFS3_DATA_ISBPTR; } -static inline lfs3_size_t lfs3_data_size(lfs3_data_t data) { - return data.size & ~LFS3_DATA_ONDISK & ~LFS3_DATA_ISBPTR; +static inline lfs3_size_t lfs3_data_size(const lfs3_data_t *data) { + return data->size & ~(LFS3_DATA_ONDISK | LFS3_DATA_ISBPTR); } #ifdef LFS3_CKDATACKSUMS -static inline lfs3_size_t lfs3_data_cksize(lfs3_data_t data) { - return data.u.disk.cksize & ~LFS3_DATA_ISERASED; +static inline lfs3_size_t lfs3_data_cksize(const lfs3_data_t *data) { + return data->u.disk.cksize & ~LFS3_DATA_ISERASED; } #endif #ifdef LFS3_CKDATACKSUMS -static inline uint32_t lfs3_data_cksum(lfs3_data_t data) { - return data.u.disk.cksum; +static inline uint32_t lfs3_data_cksum(const lfs3_data_t *data) { + return data->u.disk.cksum; } #endif // data slicing -static inline lfs3_data_t lfs3_data_slice(lfs3_data_t data, +static inline void lfs3_data_slice(lfs3_data_t *data, lfs3_ssize_t off, lfs3_ssize_t size) { // limit our off/size to data range, note the use of unsigned casts // here to treat -1 as unbounded @@ -1563,23 +1563,28 @@ static inline lfs3_data_t lfs3_data_slice(lfs3_data_t data, // on-disk? if (lfs3_data_ondisk(data)) { - data.u.disk.off += off_; - data.size -= lfs3_data_size(data) - size_; + data->u.disk.off += off_; + data->size -= lfs3_data_size(data) - size_; // buffer? } else { - data.u.buffer += off_; - data.size -= lfs3_data_size(data) - size_; + data->u.buffer += off_; + data->size -= lfs3_data_size(data) - size_; } +} - return data; +static inline lfs3_data_t lfs3_data_fromslice(const lfs3_data_t *data, + lfs3_ssize_t off, lfs3_ssize_t size) { + lfs3_data_t data_ = *data; + lfs3_data_slice(&data_, off, size); + return data_; } // this macro provides an lvalue for use in other macros, but compound // literals currently optimize poorly, so measure before use and consider // just using lfs3_data_slice instead #define LFS3_DATA_SLICE(_data, _off, _size) \ - ((struct {lfs3_data_t d;}){lfs3_data_slice(_data, _off, _size)}.d) + ((struct {lfs3_data_t d;}){lfs3_data_fromslice(_data, _off, _size)}.d) // data <-> bd interactions @@ -1595,22 +1600,22 @@ static inline bool lfs3_m_isckdatacksums(uint32_t flags); static lfs3_ssize_t lfs3_data_read(lfs3_t *lfs3, lfs3_data_t *data, void *buffer, lfs3_size_t size) { // limit our size to data range - lfs3_size_t d = lfs3_min(size, lfs3_data_size(*data)); + lfs3_size_t d = lfs3_min(size, lfs3_data_size(data)); // on-disk? - if (lfs3_data_ondisk(*data)) { + if (lfs3_data_ondisk(data)) { // validating data cksums? if (LFS3_IFDEF_CKDATACKSUMS( lfs3_m_isckdatacksums(lfs3->flags) - && lfs3_data_isbptr(*data), + && lfs3_data_isbptr(data), false)) { #ifdef LFS3_CKDATACKSUMS int err = lfs3_bd_readck(lfs3, data->u.disk.block, data->u.disk.off, // note our hint includes the full data range - lfs3_data_size(*data), + lfs3_data_size(data), buffer, d, - lfs3_data_cksize(*data), lfs3_data_cksum(*data)); + lfs3_data_cksize(data), lfs3_data_cksum(data)); if (err) { return err; } @@ -1620,7 +1625,7 @@ static lfs3_ssize_t lfs3_data_read(lfs3_t *lfs3, lfs3_data_t *data, int err = lfs3_bd_read(lfs3, data->u.disk.block, data->u.disk.off, // note our hint includes the full data range - lfs3_data_size(*data), + lfs3_data_size(data), buffer, d); if (err) { return err; @@ -1632,7 +1637,7 @@ static lfs3_ssize_t lfs3_data_read(lfs3_t *lfs3, lfs3_data_t *data, lfs3_memcpy(buffer, data->u.buffer, d); } - *data = lfs3_data_slice(*data, d, -1); + lfs3_data_slice(data, d, -1); return d; } @@ -1676,7 +1681,7 @@ static int lfs3_data_readleb128(lfs3_t *lfs3, lfs3_data_t *data, return LFS3_ERR_CORRUPT; } - *data = lfs3_data_slice(*data, d, -1); + lfs3_data_slice(data, d, -1); return 0; } @@ -1699,7 +1704,7 @@ static inline int lfs3_data_readlleb128(lfs3_t *lfs3, lfs3_data_t *data, return 0; } -static lfs3_scmp_t lfs3_data_cmp(lfs3_t *lfs3, lfs3_data_t data, +static lfs3_scmp_t lfs3_data_cmp(lfs3_t *lfs3, const lfs3_data_t *data, const void *buffer, lfs3_size_t size) { // compare common prefix lfs3_size_t d = lfs3_min(size, lfs3_data_size(data)); @@ -1727,7 +1732,7 @@ static lfs3_scmp_t lfs3_data_cmp(lfs3_t *lfs3, lfs3_data_t data, int cmp = lfs3_bd_cmp(lfs3, // note the 0 hint, we don't usually use any // following data - data.u.disk.block, data.u.disk.off, 0, + data->u.disk.block, data->u.disk.off, 0, buffer, d); if (cmp != LFS3_CMP_EQ) { return cmp; @@ -1736,7 +1741,7 @@ static lfs3_scmp_t lfs3_data_cmp(lfs3_t *lfs3, lfs3_data_t data, // buffer? } else { - int cmp = lfs3_memcmp(data.u.buffer, buffer, d); + int cmp = lfs3_memcmp(data->u.buffer, buffer, d); if (cmp < 0) { return LFS3_CMP_LT; } else if (cmp > 0) { @@ -1754,11 +1759,12 @@ static lfs3_scmp_t lfs3_data_cmp(lfs3_t *lfs3, lfs3_data_t data, } } -static lfs3_scmp_t lfs3_data_namecmp(lfs3_t *lfs3, lfs3_data_t data, +static lfs3_scmp_t lfs3_data_namecmp(lfs3_t *lfs3, const lfs3_data_t *data, lfs3_did_t did, const char *name, lfs3_size_t name_len) { // first compare the did + lfs3_data_t data_ = *data; lfs3_did_t did_; - int err = lfs3_data_readleb128(lfs3, &data, &did_); + int err = lfs3_data_readleb128(lfs3, &data_, &did_); if (err) { return err; } @@ -1770,12 +1776,12 @@ static lfs3_scmp_t lfs3_data_namecmp(lfs3_t *lfs3, lfs3_data_t data, } // then compare the actual name - return lfs3_data_cmp(lfs3, data, name, name_len); + return lfs3_data_cmp(lfs3, &data_, name, name_len); } #ifndef LFS3_RDONLY static int lfs3_bd_progdata(lfs3_t *lfs3, - lfs3_block_t block, lfs3_size_t off, lfs3_data_t data, + lfs3_block_t block, lfs3_size_t off, const lfs3_data_t *data, uint32_t *cksum) { // on-disk? if (lfs3_data_ondisk(data)) { @@ -1797,7 +1803,7 @@ static int lfs3_bd_progdata(lfs3_t *lfs3, } else { int err = lfs3_bd_cpy(lfs3, block, off, - data.u.disk.block, data.u.disk.off, lfs3_data_size(data), + data->u.disk.block, data->u.disk.off, lfs3_data_size(data), lfs3_data_size(data), cksum); if (err) { @@ -1808,7 +1814,7 @@ static int lfs3_bd_progdata(lfs3_t *lfs3, // buffer? } else { int err = lfs3_bd_prog(lfs3, block, off, - data.u.buffer, data.size, + data->u.buffer, data->size, cksum); if (err) { return err; @@ -2134,7 +2140,7 @@ static lfs3_scmp_t lfs3_attr_cmp(lfs3_t *lfs3, const struct lfs3_attr *attr, if (lfs3_attr_isnoattr(attr)) { return LFS3_CMP_LT; } else { - return lfs3_data_cmp(lfs3, *data, + return lfs3_data_cmp(lfs3, data, attr->buffer, lfs3_attr_size(attr)); } @@ -2190,12 +2196,12 @@ static lfs3_sblock_t lfs3_alloc(lfs3_t *lfs3, uint32_t flags); #endif static void lfs3_bptr_init(lfs3_bptr_t *bptr, - lfs3_data_t data, lfs3_size_t cksize, uint32_t cksum) { + lfs3_block_t block, lfs3_size_t off, lfs3_size_t size, + lfs3_size_t cksize, uint32_t cksum) { // make sure the bptr flag is set - LFS3_ASSERT(lfs3_data_ondisk(data)); - bptr->d.size = LFS3_DATA_ONDISK | LFS3_BPTR_ISBPTR | data.size; - bptr->d.u.disk.block = data.u.disk.block; - bptr->d.u.disk.off = data.u.disk.off; + bptr->d.size = LFS3_DATA_ONDISK | LFS3_BPTR_ISBPTR | size; + bptr->d.u.disk.block = block; + bptr->d.u.disk.off = off; #ifdef LFS3_CKDATACKSUMS bptr->d.u.disk.cksize = cksize; bptr->d.u.disk.cksum = cksum; @@ -2275,7 +2281,7 @@ static inline uint32_t lfs3_bptr_cksum(const lfs3_bptr_t *bptr) { // slice a bptr in-place static inline void lfs3_bptr_slice(lfs3_bptr_t *bptr, lfs3_ssize_t off, lfs3_ssize_t size) { - bptr->d = lfs3_data_slice(bptr->d, off, size); + lfs3_data_slice(&bptr->d, off, size); } // bptr on-disk encoding @@ -2283,7 +2289,7 @@ static inline void lfs3_bptr_slice(lfs3_bptr_t *bptr, static lfs3_data_t lfs3_data_frombptr(const lfs3_bptr_t *bptr, uint8_t buffer[static LFS3_BPTR_DSIZE]) { // size should not exceed 28-bits - LFS3_ASSERT(lfs3_data_size(bptr->d) <= 0x0fffffff); + LFS3_ASSERT(lfs3_bptr_size(bptr) <= 0x0fffffff); // block should not exceed 31-bits LFS3_ASSERT(lfs3_bptr_block(bptr) <= 0x7fffffff); // off should not exceed 28-bits @@ -2293,7 +2299,7 @@ static lfs3_data_t lfs3_data_frombptr(const lfs3_bptr_t *bptr, lfs3_ssize_t d = 0; // write the block, offset, size - lfs3_ssize_t d_ = lfs3_toleb128(lfs3_data_size(bptr->d), &buffer[d], 4); + lfs3_ssize_t d_ = lfs3_toleb128(lfs3_bptr_size(bptr), &buffer[d], 4); if (d_ < 0) { LFS3_UNREACHABLE(); } @@ -2375,10 +2381,9 @@ static int lfs3_bptr_alloc(lfs3_t *lfs3, lfs3_bptr_t *bptr) { } lfs3_bptr_init(bptr, - LFS3_DATA_DISK(block, 0, 0), + block, 0, 0, // mark as erased - LFS3_BPTR_ISERASED | 0, - 0); + LFS3_BPTR_ISERASED | 0, 0); return 0; } #endif @@ -3351,13 +3356,13 @@ static int lfs3_rbyd_appendrattr_(lfs3_t *lfs3, lfs3_rbyd_t *rbyd, // immediate data? } else if (from == LFS3_FROM_DATA) { ctx.u.data.size = args[0]; - if (!lfs3_data_ondisk(ctx.u.data)) { + if (!(ctx.u.data.size & LFS3_DATA_ONDISK)) { ctx.u.data.u.buffer = (const uint8_t*)args[1]; } else { ctx.u.data.u.disk.block = args[1]; ctx.u.data.u.disk.off = args[2]; #ifdef LFS3_CKDATACKSUMS - if (lfs3_data_isbptr(ctx.u.data)) { + if (!(ctx.u.data.size & LFS3_DATA_ISBPTR)) { ctx.u.data.u.disk.cksize = args[3]; ctx.u.data.u.disk.cksum = args[4]; } @@ -3470,7 +3475,7 @@ static int lfs3_rbyd_appendrattr_(lfs3_t *lfs3, lfs3_rbyd_t *rbyd, // find the concatenated size lfs3_size_t size = 0; for (lfs3_size_t i = 0; i < data_count; i++) { - size += lfs3_data_size(datas[i]); + size += lfs3_data_size(&datas[i]); } // do we fit? @@ -3489,13 +3494,13 @@ static int lfs3_rbyd_appendrattr_(lfs3_t *lfs3, lfs3_rbyd_t *rbyd, // append data for (lfs3_size_t i = 0; i < data_count; i++) { err = lfs3_bd_progdata(lfs3, - rbyd->blocks[0], lfs3_rbyd_eoff(rbyd), datas[i], + rbyd->blocks[0], lfs3_rbyd_eoff(rbyd), &datas[i], &rbyd->cksum); if (err) { return err; } - rbyd->eoff += lfs3_data_size(datas[i]); + rbyd->eoff += lfs3_data_size(&datas[i]); } // keep track of most recent parity @@ -4559,7 +4564,7 @@ static lfs3_ssize_t lfs3_rbyd_estimate(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, weight += weight_; // include the cost of this tag - dsize_ += lfs3->rattr_estimate + lfs3_data_size(data); + dsize_ += lfs3->rattr_estimate + lfs3_data_size(&data); } if (a_rid == -1) { @@ -4891,7 +4896,7 @@ static lfs3_scmp_t lfs3_rbyd_namelookup(lfs3_t *lfs3, const lfs3_rbyd_t *rbyd, // compare names } else { - cmp = lfs3_data_namecmp(lfs3, data__, did, name, name_len); + cmp = lfs3_data_namecmp(lfs3, &data__, did, name, name_len); if (cmp < 0) { return cmp; } @@ -5161,7 +5166,7 @@ static lfs3_data_t lfs3_data_frombtree(const lfs3_btree_t *btree, d += d_; lfs3_data_t data = lfs3_data_frombranch(&btree->r, &buffer[d]); - d += lfs3_data_size(data); + d += lfs3_data_size(&data); return LFS3_DATA_BUF(buffer, d); } @@ -6800,7 +6805,7 @@ static int lfs3_bshrub_commitroot_(lfs3_t *lfs3, lfs3_bshrub_t *bshrub, const lfs3_data_t *datas = (const lfs3_data_t*)lfs3_rattr_arg(r, 0); for (lfs3_size_t j = 0; j < lfs3_rattr_count(r); j++) { - commit_estimate += lfs3_data_size(datas[j]); + commit_estimate += lfs3_data_size(&datas[j]); } } else { commit_estimate += lfs3_rattr_count(r); @@ -8591,7 +8596,7 @@ static lfs3_ssize_t lfs3_mdir_estimate___(lfs3_t *lfs3, const lfs3_mdir_t *mdir, } else { // include the cost of this tag - dsize_ += lfs3->mattr_estimate + lfs3_data_size(data); + dsize_ += lfs3->mattr_estimate + lfs3_data_size(&data); } } @@ -10486,7 +10491,7 @@ static lfs3_data_t lfs3_data_fromgbmap(const lfs3_gbmap_t *gbmap, d += d_; lfs3_data_t data = lfs3_data_frombranch(&gbmap->b.r, &buffer[d]); - d += lfs3_data_size(data); + d += lfs3_data_size(&data); return LFS3_DATA_BUF(buffer, lfs3_memlen(buffer, LFS3_GBMAP_DSIZE)); } @@ -11736,7 +11741,7 @@ static int lfs3_stat_(lfs3_t *lfs3, const lfs3_mdir_t *mdir, info->type = lfs3_tag_subtype(tag); // read the file name - LFS3_ASSERT(lfs3_data_size(name) <= LFS3_NAME_MAX); + LFS3_ASSERT(lfs3_data_size(&name) <= LFS3_NAME_MAX); lfs3_ssize_t name_len = lfs3_data_read(lfs3, &name, info->name, LFS3_NAME_MAX); if (name_len < 0) { @@ -12072,7 +12077,7 @@ lfs3_ssize_t lfs3_sizeattr(lfs3_t *lfs3, const char *path, uint8_t type) { } // return the attr size - return lfs3_data_size(data); + return lfs3_data_size(&data); } #ifndef LFS3_RDONLY @@ -12634,10 +12639,10 @@ static lfs3_ssize_t lfs3_file_readnext(lfs3_t *lfs3, lfs3_file_t *file, size, lfs3_bptr_size(&file->leaf.bptr) - (pos_ - file->leaf.pos)); - lfs3_data_t slice = lfs3_data_slice(file->leaf.bptr.d, - pos_ - file->leaf.pos, - d); - d = lfs3_data_read(lfs3, &slice, + d = lfs3_data_read(lfs3, + &LFS3_DATA_SLICE(&file->leaf.bptr.d, + pos_ - file->leaf.pos, + d), buffer, d); if (d < 0) { return d; @@ -12966,7 +12971,7 @@ static int lfs3_file_graft_(lfs3_t *lfs3, lfs3_file_t *file, if (weight + delta > 0) { lfs3_size_t dsize = 0; for (lfs3_size_t i = 0; i < lfs3_graft_count(graft_count); i++) { - dsize += lfs3_data_size(graft[i]); + dsize += lfs3_data_size(&graft[i]); } // can we coalesce a hole? @@ -13181,7 +13186,7 @@ static int lfs3_file_crystallize_(lfs3_t *lfs3, lfs3_file_t *file, lfs3_bptr_size(&file->leaf.bptr) - (pos_ - file->leaf.pos)); int err = lfs3_bd_progdata(lfs3, block_, pos_ - block_pos, - lfs3_data_slice(file->leaf.bptr.d, + &LFS3_DATA_SLICE(&file->leaf.bptr.d, pos_ - file->leaf.pos, d_), &lfs3->pcksum); @@ -13247,7 +13252,7 @@ static int lfs3_file_crystallize_(lfs3_t *lfs3, lfs3_file_t *file, lfs3_bptr_size(&bptr__) - (pos_ - (bid__-(weight__-1)))); err = lfs3_bd_progdata(lfs3, block_, pos_ - block_pos, - lfs3_data_slice(bptr__.d, + &LFS3_DATA_SLICE(&bptr__.d, pos_ - (bid__-(weight__-1)), d_), &lfs3->pcksum); @@ -13332,7 +13337,7 @@ static int lfs3_file_crystallize_(lfs3_t *lfs3, lfs3_file_t *file, file->leaf.pos = block_pos + off_; file->leaf.weight = pos_ - file->leaf.pos; lfs3_bptr_init(&file->leaf.bptr, - LFS3_DATA_DISK(block_, off_, pos_ - file->leaf.pos), + block_, off_, pos_ - file->leaf.pos, // mark as erased, unless crystal_thresh prevented // prog alignment (((pos_ - block_pos) % lfs3->cfg->prog_size == 0) @@ -13734,7 +13739,7 @@ fragment:; if (bid-(weight-1) + lfs3_bptr_size(&bptr) >= fragment_start && fragment_end - (bid-(weight-1)) <= lfs3->cfg->fragment_size) { - datas[data_count++] = lfs3_data_slice(bptr.d, + datas[data_count++] = lfs3_data_fromslice(&bptr.d, -1, fragment_start - (bid-(weight-1))); @@ -13769,7 +13774,7 @@ fragment:; && bid-(weight-1) + lfs3_bptr_size(&bptr) - fragment_start <= lfs3->cfg->fragment_size) { - datas[data_count++] = lfs3_data_slice(bptr.d, + datas[data_count++] = lfs3_data_fromslice(&bptr.d, fragment_end - (bid-(weight-1)), -1); @@ -15161,7 +15166,7 @@ static int lfs3_data_readcompat(lfs3_t *lfs3, lfs3_data_t *data, // this is a compromise in correctness and and compat-flag complexity // // we don't really care about performance here - while (lfs3_data_size(*data) > 0) { + while (lfs3_data_size(data) > 0) { uint8_t b; lfs3_ssize_t d = lfs3_data_read(lfs3, data, &b, 1); if (d < 0) { @@ -15489,7 +15494,7 @@ static int lfs3_mountinited(lfs3_t *lfs3) { } // treat corrupted magic as no magic - lfs3_scmp_t cmp = lfs3_data_cmp(lfs3, data_, "littlefs", 8); + lfs3_scmp_t cmp = lfs3_data_cmp(lfs3, &data_, "littlefs", 8); if (cmp < 0) { return cmp; } diff --git a/tests/test_btree.toml b/tests/test_btree.toml index 4e1ade02..b5686adc 100644 --- a/tests/test_btree.toml +++ b/tests/test_btree.toml @@ -4507,7 +4507,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); } else { // well this shouldn't happen @@ -4665,7 +4665,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); } else { // well this shouldn't happen diff --git a/tests/test_fwrite.toml b/tests/test_fwrite.toml index 37c912d2..7ee50cf7 100644 --- a/tests/test_fwrite.toml +++ b/tests/test_fwrite.toml @@ -213,7 +213,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // keep track of how many fragments we've seen fragments += 1; @@ -361,7 +361,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // if block crystallization is working we shouldn't be // left with any inlined data fragments @@ -627,7 +627,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // keep track of how many fragments we've seen fragments += 1; @@ -790,7 +790,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // if block crystallization is working we shouldn't be // left with any inlined data fragments @@ -2118,7 +2118,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // keep track of how many fragments we've seen fragments += 1; @@ -2270,7 +2270,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // keep track of how many fragments we've seen fragments += 1; @@ -2569,7 +2569,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // keep track of how many fragments we've seen fragments += 1; @@ -2736,7 +2736,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // if block crystallization is working we shouldn't be // left with any inlined data fragments @@ -3029,7 +3029,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // keep track of how many fragments we've seen fragments += 1; @@ -3200,7 +3200,7 @@ code = ''' bid, tag, weight, - lfs3_data_size(data)); + lfs3_data_size(&data)); // if block crystallization is working we shouldn't be // left with any inlined data fragments diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index ec10ea9c..ad4430b8 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -151,7 +151,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -160,7 +160,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -178,12 +178,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -192,12 +192,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -215,12 +215,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -229,12 +229,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' @@ -269,7 +269,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -278,7 +278,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -298,12 +298,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -312,12 +312,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -337,12 +337,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -351,12 +351,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' @@ -597,12 +597,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // split the other direction // >b @@ -622,12 +622,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_bflips] @@ -668,12 +668,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // flip a black edge // b @@ -695,12 +695,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_trifoliate] @@ -743,17 +743,17 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // flip a black edge // >r @@ -777,17 +777,17 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_rflips] @@ -832,17 +832,17 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // ignore a red edge, flip a black edge // r @@ -904,17 +904,17 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // flip a red edge, ignore a black edge // r @@ -940,17 +940,17 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_quadrifoliate] @@ -997,22 +997,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // ignore a red edge, flip a black edge // y @@ -1040,22 +1040,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // flip a red edge and black edge // >y @@ -1083,22 +1083,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // flip a red edge, ignore a black edge // >y @@ -1126,22 +1126,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_rotations] @@ -1188,22 +1188,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // yellow and red alt the same // y b @@ -1475,22 +1475,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // split a yellow triple, taking the yellow alt // b @@ -1520,22 +1520,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_quintifoliate] @@ -1588,27 +1588,27 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // split a yellow triple, taking the black alt // b @@ -1694,27 +1694,27 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // split a yellow triple, taking the yellow alt // >b @@ -1746,27 +1746,27 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_prunes] @@ -1821,27 +1821,27 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // prune by taking a red alt // b @@ -2071,32 +2071,32 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(6), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(6)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // prune by taking a yellow alt (this needs to prune during the rflip) // b @@ -2132,32 +2132,32 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(5)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(6), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(6)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_atomic_permutations] @@ -2226,7 +2226,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } // keep track of the worst size @@ -2315,7 +2315,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } // keep track of the worst size @@ -2374,12 +2374,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2388,12 +2388,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2411,12 +2411,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2425,12 +2425,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' @@ -2471,12 +2471,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2485,12 +2485,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2510,12 +2510,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2524,12 +2524,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' @@ -2599,7 +2599,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2670,7 +2670,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2768,7 +2768,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); } // keep track of the worst size @@ -2858,7 +2858,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(x & 0x7f)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } ''' @@ -2922,12 +2922,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2936,12 +2936,12 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -2962,7 +2962,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), @@ -2973,7 +2973,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_) => LFS3_ERR_NOENT; lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), @@ -3074,12 +3074,12 @@ code = ''' } else { assert(tag_ == LFS3_TAG_ATTR(j+1+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } else { assert(tag_ == LFS3_TAG_ATTR(k+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } @@ -3098,11 +3098,11 @@ code = ''' if (k == j) { assert(tag_ == LFS3_TAG_ATTR(k+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); } else { assert(tag_ == LFS3_TAG_ATTR(k+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } @@ -3222,11 +3222,11 @@ code = ''' if (k >= j) { assert(tag_ == LFS3_TAG_ATTR(k+1+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } else { assert(tag_ == LFS3_TAG_ATTR(k+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } @@ -3270,22 +3270,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3297,22 +3297,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3323,22 +3323,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3349,22 +3349,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3374,22 +3374,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' @@ -3438,22 +3438,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3465,22 +3465,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3491,22 +3491,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3517,22 +3517,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3545,22 +3545,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3571,22 +3571,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3597,22 +3597,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -3622,22 +3622,22 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(2), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(4), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(4)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(5), &rid_, NULL, &data_) => LFS3_ERR_NOENT; ''' @@ -3833,7 +3833,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); for (unsigned j = 1; j < N; j++) { lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(j+1), &rid_, NULL, &data_) => LFS3_ERR_NOENT; @@ -4476,7 +4476,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4485,7 +4485,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4498,7 +4498,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4507,7 +4507,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4554,7 +4554,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4563,7 +4563,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4576,7 +4576,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4585,7 +4585,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4609,7 +4609,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4618,7 +4618,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4631,7 +4631,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4640,7 +4640,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -4730,7 +4730,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -4810,7 +4810,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == x); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } ''' @@ -5612,7 +5612,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5621,7 +5621,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5630,7 +5630,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5639,7 +5639,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5652,7 +5652,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5661,7 +5661,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5670,7 +5670,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5679,7 +5679,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5734,7 +5734,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5743,7 +5743,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5752,7 +5752,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5761,7 +5761,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5774,7 +5774,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5783,7 +5783,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5792,7 +5792,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5801,7 +5801,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5833,7 +5833,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5842,7 +5842,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5851,7 +5851,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5860,7 +5860,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5873,7 +5873,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5882,7 +5882,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5891,7 +5891,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 4; @@ -5900,7 +5900,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 1); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; lfs3_data_read(&lfs3, &data, buffer, 4) => 2; @@ -5999,7 +5999,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6011,7 +6011,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == j); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6290,16 +6290,16 @@ code = ''' } else if (u == M-1) { assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k+1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } else { assert(tag_ == LFS3_TAG_ATTR(u+1+1)); assert(rid_ == k); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } else { assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == k); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6330,7 +6330,7 @@ code = ''' if (k == j/M && u == j%M) { assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == k); - assert(lfs3_data_size(data_) == 3); + assert(lfs3_data_size(&data_) == 3); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6339,7 +6339,7 @@ code = ''' } else { assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == k); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6590,14 +6590,14 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == x); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); for (unsigned u = 0; u < M; u++) { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, x, LFS3_TAG_ATTR(u+1), &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == x); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } ''' @@ -6709,7 +6709,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 1); + assert(lfs3_data_size(&data_) == 1); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6721,7 +6721,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6871,7 +6871,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(j+1)); assert(rid_ == -1); - assert(lfs3_data_size(data_) == 1); + assert(lfs3_data_size(&data_) == 1); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6883,7 +6883,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -6895,7 +6895,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == j); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -11551,7 +11551,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -11690,7 +11690,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -11706,7 +11706,7 @@ code = ''' &rid_, NULL, &data_); assert(tag_ == LFS3_TAG_ATTR(u+1)); assert(rid_ == k); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -12503,7 +12503,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, @@ -12511,7 +12511,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // make id2 with weight w2 lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -12525,13 +12525,13 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, @@ -12539,13 +12539,13 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // make id5 with weight w3 lfs3_rbyd_commit(&lfs3, &rbyd, 3, LFS3_RATTRS( @@ -12559,19 +12559,19 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, @@ -12579,19 +12579,19 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // make id9 with weight w4 lfs3_rbyd_commit(&lfs3, &rbyd, 6, LFS3_RATTRS( @@ -12605,25 +12605,25 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, @@ -12631,25 +12631,25 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); // make id14 with weight w5 lfs3_rbyd_commit(&lfs3, &rbyd, 10, LFS3_RATTRS( @@ -12663,31 +12663,31 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, @@ -12695,31 +12695,31 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); ''' [cases.test_rbyd_sparse_traverse] @@ -12771,31 +12771,31 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_) => LFS3_ERR_NOENT; @@ -12805,31 +12805,31 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_) => LFS3_ERR_NOENT; ''' @@ -12916,7 +12916,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, &data) => LFS3_TAG_DATA; @@ -13011,7 +13011,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -13062,25 +13062,25 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), @@ -13088,25 +13088,25 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); // make id2 with weight w2 lfs3_rbyd_commit(&lfs3, &rbyd, 1, LFS3_RATTRS( @@ -13124,43 +13124,43 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), @@ -13168,43 +13168,43 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); // make id5 with weight w3 lfs3_rbyd_commit(&lfs3, &rbyd, 3, LFS3_RATTRS( @@ -13223,61 +13223,61 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), @@ -13285,61 +13285,61 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); // make id9 with weight w4 lfs3_rbyd_commit(&lfs3, &rbyd, 6, LFS3_RATTRS( @@ -13358,79 +13358,79 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), @@ -13438,79 +13438,79 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); // make id14 with weight w5 lfs3_rbyd_commit(&lfs3, &rbyd, 10, LFS3_RATTRS( @@ -13529,97 +13529,97 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_fetch(&lfs3, &rbyd, rbyd.blocks[0], 0) => 0; tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, -1, LFS3_TAG_ATTR(3), @@ -13627,97 +13627,97 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 0, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 2, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 5, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 9, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, 14, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); ''' [cases.test_rbyd_sparse_mixed_traverse] @@ -13794,97 +13794,97 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_) => LFS3_ERR_NOENT; @@ -13894,97 +13894,97 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_) => LFS3_ERR_NOENT; ''' @@ -14080,26 +14080,26 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); for (unsigned j = 0; j < N; j++) { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_ATTR(1), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == j*W+W-1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_ATTR(2), &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == j*W+W-1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); lfs3_rbyd_lookup(&lfs3, &rbyd, j*W+W-1, LFS3_TAG_DATA, &data) => LFS3_TAG_DATA; @@ -14203,14 +14203,14 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 9); + assert(lfs3_data_size(&data_) == 9); for (unsigned j = 0; j < N; j++) { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14222,13 +14222,13 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == j*W+W-1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == j*W+W-1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_) => LFS3_ERR_NOENT; @@ -14349,7 +14349,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } else if (k > j) { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1+D, LFS3_TAG_DATA, @@ -14357,7 +14357,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } else { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, @@ -14365,7 +14365,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, @@ -14490,7 +14490,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14503,7 +14503,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14516,7 +14516,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14643,7 +14643,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14656,7 +14656,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1+D); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14669,7 +14669,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1+D); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14682,7 +14682,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14805,7 +14805,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } else if (k > j) { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1-D, LFS3_TAG_DATA, @@ -14813,7 +14813,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } else { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, k*W+W-1, LFS3_TAG_DATA, @@ -14821,7 +14821,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, @@ -14946,7 +14946,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14959,7 +14959,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -14972,7 +14972,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15099,7 +15099,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15112,7 +15112,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1-D); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15125,7 +15125,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1-D); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15138,7 +15138,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(2)); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15260,7 +15260,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15273,7 +15273,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15301,7 +15301,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15314,7 +15314,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15436,7 +15436,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15450,7 +15450,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == k*W+W-1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } @@ -15470,7 +15470,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15500,7 +15500,7 @@ code = ''' assert(tag_ == LFS3_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_rbyd_lookup(&lfs3, &rbyd, rid_, tag_, &data) => tag_; @@ -15514,7 +15514,7 @@ code = ''' assert(tag_ == LFS3_TAG_ATTR(1)); assert(rid_ == k*W+W-1); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } } @@ -15973,7 +15973,7 @@ code = ''' j, LFS3_tag_MASK8 | LFS3_TAG_ATTR, &data_); assert(tag_ == LFS3_TAG_ATTR((j + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } ''' @@ -16089,7 +16089,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); if (k != j) { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -16097,7 +16097,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -16114,7 +16114,7 @@ code = ''' LFS3_tag_MASK8 | LFS3_TAG_ATTR, &data_); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } } @@ -16237,7 +16237,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); @@ -16245,12 +16245,12 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 3); + assert(lfs3_data_size(&data_) == 3); } else { assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -16263,10 +16263,10 @@ code = ''' &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 3); + assert(lfs3_data_size(&data_) == 3); } else { assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } } @@ -16359,7 +16359,7 @@ code = ''' j, LFS3_tag_MASK8 | LFS3_TAG_ATTR, &data_); assert(tag_ == LFS3_TAG_ATTR(0x7f & (j + SHIFT))); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } ''' @@ -16477,7 +16477,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); if (k != j) { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -16485,7 +16485,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x7f & (k + SHIFT))); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -16493,7 +16493,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x80)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 1); + assert(lfs3_data_size(&data_) == 1); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_) => LFS3_ERR_NOENT; @@ -16509,7 +16509,7 @@ code = ''' LFS3_tag_MASK8 | LFS3_TAG_ATTR, &data_); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } } @@ -16634,7 +16634,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); @@ -16642,12 +16642,12 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x7f & ~(k + SHIFT))); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 3); + assert(lfs3_data_size(&data_) == 3); } else { assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x7f & (k + SHIFT))); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -16655,7 +16655,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(0x80)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 1); + assert(lfs3_data_size(&data_) == 1); } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_) => LFS3_ERR_NOENT; @@ -16667,10 +16667,10 @@ code = ''' &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 3); + assert(lfs3_data_size(&data_) == 3); } else { assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } } @@ -16759,7 +16759,7 @@ code = ''' j, LFS3_tag_MASK8 | LFS3_TAG_ATTR, &data_); assert(tag_ == LFS3_TAG_ATTR((j + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } ''' @@ -16874,17 +16874,17 @@ code = ''' assert(rid_ == k+1); assert(tag_ == LFS3_TAG_ATTR((k+1 + SHIFT) & 0x7f)); assert(weight_ == 2); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } else if (k > j) { assert(rid_ == k+1); assert(tag_ == LFS3_TAG_ATTR((k+1 + SHIFT) & 0x7f)); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } else { assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -16901,7 +16901,7 @@ code = ''' LFS3_tag_MASK8 | LFS3_TAG_ATTR, &data_); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } } @@ -17023,12 +17023,12 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); } else { assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -17041,10 +17041,10 @@ code = ''' &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 6); + assert(lfs3_data_size(&data_) == 6); } else { assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } } @@ -17135,7 +17135,7 @@ code = ''' tag_ = lfs3_rbyd_lookup(&lfs3, &rbyd, j, LFS3_tag_MASK12, &data_); assert(tag_ == LFS3_TAG_DATA); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); } } ''' @@ -17253,14 +17253,14 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == ((k == j+1) ? 2 : 1)); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -17277,7 +17277,7 @@ code = ''' LFS3_tag_MASK8 | LFS3_TAG_ATTR, &data_); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } } @@ -17401,7 +17401,7 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 3); + assert(lfs3_data_size(&data_) == 3); } else { tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -17409,14 +17409,14 @@ code = ''' assert(rid_ == k); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); tag_ = lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, &rid_, &weight_, &data_); assert(rid_ == k); assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } lfs3_rbyd_lookupnext(&lfs3, &rbyd, rid_, tag_+1, @@ -17429,10 +17429,10 @@ code = ''' &data_); if (k == j) { assert(tag_ == LFS3_TAG_ATTR(~(k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 3); + assert(lfs3_data_size(&data_) == 3); } else { assert(tag_ == LFS3_TAG_ATTR((k + SHIFT) & 0x7f)); - assert(lfs3_data_size(data_) == 2); + assert(lfs3_data_size(&data_) == 2); } } } @@ -17485,7 +17485,7 @@ code = ''' assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(1)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); uint8_t rbuf[32]; lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xbb\xbb\xbb\xbb", 4) == 0); @@ -17539,7 +17539,7 @@ code = ''' assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(2)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); uint8_t rbuf[32]; lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); @@ -17595,7 +17595,7 @@ code = ''' assert(rid_ == 0); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); uint8_t rbuf[32]; lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); @@ -17651,7 +17651,7 @@ code = ''' assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(0x02)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); uint8_t rbuf[32]; lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); @@ -17661,7 +17661,7 @@ code = ''' assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(0x80)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xdd\xdd\xdd\xdd", 4) == 0); @@ -17718,7 +17718,7 @@ code = ''' assert(rid_ == -1); assert(tag_ == LFS3_TAG_ATTR(2)); assert(weight_ == 0); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); uint8_t rbuf[32]; lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); @@ -17728,7 +17728,7 @@ code = ''' assert(rid_ == 0); assert(tag_ == LFS3_TAG_DATA); assert(weight_ == 1); - assert(lfs3_data_size(data_) == 4); + assert(lfs3_data_size(&data_) == 4); lfs3_data_read(&lfs3, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xdd\xdd\xdd\xdd", 4) == 0);