diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-08-15 14:45:02 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-08-15 14:45:02 (GMT) |
| commit | da1e2ca0893d82ae3faa42acebae48b428185d02 (patch) | |
| tree | 36c68d4abedf388765f7cea36e758291ab18cd85 /src/H5B.c | |
| parent | 7f4843c06bfdf62da93f4e7a68fda17a3b3e3070 (diff) | |
| download | hdf5-da1e2ca0893d82ae3faa42acebae48b428185d02.zip hdf5-da1e2ca0893d82ae3faa42acebae48b428185d02.tar.gz hdf5-da1e2ca0893d82ae3faa42acebae48b428185d02.tar.bz2 | |
[svn-r7369] Purpose:
Bug fix
Description:
The metadata cache 'destroy' callback routines need the file handle in
order for certain callback routines (currently just the H5HG one) to perform
extra cleanups. The recent change to call the 'destroy' callback from the
'clear' callback omitted this parameter.
Solution:
Add the file handle to the metadata cache 'clear' callbacks.
Platforms tested:
FreeBSD 4.8 (sleipnir)
too small to need h5committest
Diffstat (limited to 'src/H5B.c')
| -rw-r--r-- | src/H5B.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -154,7 +154,7 @@ static herr_t H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_ static H5B_t *H5B_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_type, void *udata); static herr_t H5B_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *b); static herr_t H5B_dest(H5F_t *f, H5B_t *b); -static herr_t H5B_clear(H5B_t *b, hbool_t destroy); +static herr_t H5B_clear(H5F_t *f, H5B_t *b, hbool_t destroy); /* H5B inherits cache-like properties from H5AC */ static const H5AC_class_t H5AC_BT[1] = {{ @@ -560,7 +560,7 @@ H5B_dest(H5F_t UNUSED *f, H5B_t *bt) *------------------------------------------------------------------------- */ static herr_t -H5B_clear(H5B_t *bt, hbool_t destroy) +H5B_clear(H5F_t *f, H5B_t *bt, hbool_t destroy) { unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; @@ -578,7 +578,7 @@ H5B_clear(H5B_t *bt, hbool_t destroy) bt->cache_info.dirty = FALSE; if (destroy) - if (H5B_dest(NULL, bt) < 0) + if (H5B_dest(f, bt) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to destroy B-tree node"); done: |