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.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.c')
| -rw-r--r-- | src/H5Fsuper.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index 4373fa3..bb5ef3e 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -594,7 +594,8 @@ done: } /* end if */ else /* Free superblock */ - sblock = (H5F_super_t *)H5FL_FREE(H5F_super_t, sblock); + if(H5F_super_free(sblock) < 0) + HDONE_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "unable to destroy superblock") /* Reset variables in file structure */ f->shared->sblock = NULL; @@ -640,6 +641,37 @@ done: /*------------------------------------------------------------------------- + * Function: H5F_super_free + * + * Purpose: Destroyer the file's superblock + * + * Return: Success: non-negative on success + * Failure: Negative + * + * Programmer: Quincey Koziol + * April 1, 2010 + * + *------------------------------------------------------------------------- + */ +herr_t +H5F_super_free(H5F_super_t *sblock) +{ + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_super_free) + + /* 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); + + FUNC_LEAVE_NOAPI(SUCCEED) +} /* H5F_super_free() */ + + +/*------------------------------------------------------------------------- * Function: H5F_super_size * * Purpose: Get storage size of the superblock and superblock extension |