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/H5B2int.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/H5B2int.c')
| -rw-r--r-- | src/H5B2int.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5B2int.c b/src/H5B2int.c index 8c6f515..16e87a6 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -303,7 +303,7 @@ H5B2_locate_record(const H5B2_class_t *type, unsigned nrec, size_t *rec_off, hi = nrec; while(lo < hi && cmp) { my_idx = (lo + hi) / 2; - if((cmp = (type->compare)(type, udata, native + rec_off[my_idx])) < 0) + if((cmp = (type->compare)(udata, native + rec_off[my_idx])) < 0) hi = my_idx; else lo = my_idx + 1; @@ -2239,7 +2239,7 @@ H5B2_insert_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, } /* end else */ /* Make callback to store record in native form */ - if((shared->type->store)(shared->type, H5B2_LEAF_NREC(leaf,shared,idx), udata) < 0) + if((shared->type->store)(H5B2_LEAF_NREC(leaf,shared,idx), udata) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTINSERT, FAIL, "unable to insert record into leaf node") /* Update record count for node pointer to current node */ |