diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 19:06:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-06 19:06:38 (GMT) |
| commit | c956041d8a7ccdc65502b0b35dff80709772ecec (patch) | |
| tree | 911dc5e4e4f351894260e39b2d1e8efd6f6d6ca5 /src/H5HLcache.c | |
| parent | cb46189058ea4f7000c646fa24c7c7f85b825631 (diff) | |
| download | hdf5-c956041d8a7ccdc65502b0b35dff80709772ecec.zip hdf5-c956041d8a7ccdc65502b0b35dff80709772ecec.tar.gz hdf5-c956041d8a7ccdc65502b0b35dff80709772ecec.tar.bz2 | |
[svn-r18519] Description:
Bring metadata journaling branch into closer correspondence with trunk:
extract data structure freeing routines from metadata cache client 'destroy'
callbacks.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug, production & parallel
(h5committest not required on this branch)
Diffstat (limited to 'src/H5HLcache.c')
| -rw-r--r-- | src/H5HLcache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5HLcache.c b/src/H5HLcache.c index ca4b431..a5b0728 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -456,7 +456,7 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, /* Should we destroy the memory version? */ if(destroy) - if(H5HL_prfx_dest(prfx) < 0) + if(H5HL_prefix_dest(f, prfx) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix") done: @@ -532,7 +532,7 @@ H5HL_prefix_clear(H5F_t UNUSED *f, void *thing, hbool_t destroy) prfx->cache_info.is_dirty = FALSE; if(destroy) - if(H5HL_prfx_dest(prfx) < 0) + if(H5HL_prefix_dest(f, prfx) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap prefix") done: @@ -689,7 +689,7 @@ H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, /* Should we destroy the memory version? */ if(destroy) - if(H5HL_dblk_dest(dblk) < 0) + if(H5HL_datablock_dest(f, dblk) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap data block") done: @@ -761,7 +761,7 @@ H5HL_datablock_clear(H5F_t UNUSED *f, void *_thing, hbool_t destroy) dblk->cache_info.is_dirty = FALSE; if(destroy) - if(H5HL_dblk_dest(dblk) < 0) + if(H5HL_datablock_dest(f, dblk) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap data block") done: |