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/H5Gnode.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/H5Gnode.c')
| -rw-r--r-- | src/H5Gnode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Gnode.c b/src/H5Gnode.c index a7880b4..65c463e 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -70,7 +70,7 @@ static H5G_node_t *H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const vo static herr_t H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_t *sym); static herr_t H5G_node_dest(H5F_t *f, H5G_node_t *sym); -static herr_t H5G_node_clear(H5G_node_t *sym, hbool_t destroy); +static herr_t H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy); /* B-tree callbacks */ static size_t H5G_node_sizeof_rkey(H5F_t *f, const void *_udata); @@ -550,7 +550,7 @@ H5G_node_dest(H5F_t UNUSED *f, H5G_node_t *sym) *------------------------------------------------------------------------- */ static herr_t -H5G_node_clear(H5G_node_t *sym, hbool_t destroy) +H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy) { int i; /* Local index variable */ herr_t ret_value = SUCCEED; @@ -573,7 +573,7 @@ H5G_node_clear(H5G_node_t *sym, hbool_t destroy) * preempted from the cache. */ if (destroy) - if (H5G_node_dest(NULL, sym) < 0) + if (H5G_node_dest(f, sym) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node"); done: |