diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 05:35:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 05:35:17 (GMT) |
| commit | b24165b4d6229f81f68bd151862ae329ccfb1772 (patch) | |
| tree | 896d25aadd74560b60195299f9ff6ffa94ccc990 /src/H5Fsuper_cache.c | |
| parent | 2b551d282f88e7e33baf11702016535f28a2ceab (diff) | |
| download | hdf5-b24165b4d6229f81f68bd151862ae329ccfb1772.zip hdf5-b24165b4d6229f81f68bd151862ae329ccfb1772.tar.gz hdf5-b24165b4d6229f81f68bd151862ae329ccfb1772.tar.bz2 | |
[svn-r18506] Description:
Bring r18505 from trunk to 1.8 branch:
Move code to free superblock data structure into separate routine, in
preparation for upcoming metadata journaling -> trunk merging.
Tested on:
FreeBD/32 6.3 (duty) w/debug
(h5committested on trunk)
Diffstat (limited to 'src/H5Fsuper_cache.c')
| -rw-r--r-- | src/H5Fsuper_cache.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c index 91ca76d..1f19311 100644 --- a/src/H5Fsuper_cache.c +++ b/src/H5Fsuper_cache.c @@ -576,7 +576,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, const void UNUSED done: /* Release the [possibly partially initialized] superblock on errors */ if(!ret_value && sblock) - if(H5F_sblock_dest(f, sblock) < 0) + if(H5F_super_free(sblock) < 0) HDONE_ERROR(H5E_FILE, H5E_CANTFREE, NULL, "unable to destroy superblock data") FUNC_LEAVE_NOAPI(ret_value) @@ -803,18 +803,19 @@ done: static herr_t H5F_sblock_dest(H5F_t UNUSED *f, H5F_super_t* sblock) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sblock_dest) + herr_t ret_value = SUCCEED; /* Return value */ + + FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_dest) /* Sanity check */ HDassert(sblock); - /* Free root group symbol table entry, if any */ - sblock->root_ent = (H5G_entry_t *)H5MM_xfree(sblock->root_ent); - /* Free superblock */ - sblock = (H5F_super_t *)H5FL_FREE(H5F_super_t, sblock); + if(H5F_super_free(sblock) < 0) + HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock") - FUNC_LEAVE_NOAPI(SUCCEED) +done: + FUNC_LEAVE_NOAPI(ret_value) } /* end H5F_sblock_dest() */ |