diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-17 15:49:06 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-17 15:49:06 (GMT) |
| commit | 832305699d1ef7c43ac93bc83dc3bb724249f240 (patch) | |
| tree | 526437dadbe6e614580850327786adf9f46fed70 /src/H5B2cache.c | |
| parent | 7fd5028f7ccfa34bec0e46c21113dbc664c4b850 (diff) | |
| download | hdf5-832305699d1ef7c43ac93bc83dc3bb724249f240.zip hdf5-832305699d1ef7c43ac93bc83dc3bb724249f240.tar.gz hdf5-832305699d1ef7c43ac93bc83dc3bb724249f240.tar.bz2 | |
[svn-r12589] Description:
Revert passing the v2 B-tree class to callbacks, it turns out to be
unnecessary. Also revert have a "class private" pointer for each v2 B-tree
class.
Add in support for the different flavors of fractal heap 'huge' objects
also.
Tested on:
FreeBSD/32 4.11 (sleipnir)
Linux/64 2.4 (mir)
Solaris/64 2.9 (shanti)
Diffstat (limited to 'src/H5B2cache.c')
| -rw-r--r-- | src/H5B2cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5B2cache.c b/src/H5B2cache.c index 1e35804..684ea7b 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -497,7 +497,7 @@ H5B2_cache_leaf_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_nrec, v native = leaf->leaf_native; for(u = 0; u < leaf->nrec; u++) { /* Decode record */ - if((shared->type->decode)(f, shared->type, p, native) < 0) + if((shared->type->decode)(f, p, native) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, NULL, "unable to decode B-tree record") /* Move to next record */ @@ -569,7 +569,7 @@ H5B2_cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5 native = leaf->leaf_native; for(u = 0; u < leaf->nrec; u++) { /* Encode record */ - if((shared->type->encode)(f, shared->type, p, native) < 0) + if((shared->type->encode)(f, p, native) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, FAIL, "unable to encode B-tree record") /* Move to next record */ @@ -796,7 +796,7 @@ H5B2_cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_nre native = internal->int_native; for(u = 0; u < internal->nrec; u++) { /* Decode record */ - if((shared->type->decode)(f, shared->type, p, native) < 0) + if((shared->type->decode)(f, p, native) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, NULL, "unable to decode B-tree record") /* Move to next record */ @@ -881,7 +881,7 @@ H5B2_cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr native = internal->int_native; for(u = 0; u < internal->nrec; u++) { /* Encode record */ - if((shared->type->encode)(f, shared->type, p, native) < 0) + if((shared->type->encode)(f, p, native) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTENCODE, FAIL, "unable to encode B-tree record") /* Move to next record */ |