summaryrefslogtreecommitdiffstats
path: root/src/H5F.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2011-04-04 04:23:12 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2011-04-04 04:23:12 (GMT)
commitb035e980f01b19b4c25c7c1764f795e8f1939ae6 (patch)
tree99c6208e1489d76f66433260d28737027f9ad88d /src/H5F.c
parente9e713869c2a59477e77faf0aa3f7545e9858e06 (diff)
downloadhdf5-b035e980f01b19b4c25c7c1764f795e8f1939ae6.zip
hdf5-b035e980f01b19b4c25c7c1764f795e8f1939ae6.tar.gz
hdf5-b035e980f01b19b4c25c7c1764f795e8f1939ae6.tar.bz2
[svn-r20406] Description:
Refactor root group routines to centralize and simplify them some. Also patch root group's file pointer when it doesn't match the querying file, from H5G_rootof. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, w/threadsafe, in production mode Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode Mac OS X/32 10.6.6 (amazon) in debug mode Mac OS X/32 10.6.6 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode Mac OS X/32 10.6.6 (amazon) w/parallel, in debug mode
Diffstat (limited to 'src/H5F.c')
-rw-r--r--src/H5F.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/H5F.c b/src/H5F.c
index 21b9a19..2cec64d 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1053,13 +1053,8 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
* the memory associated with it.
*/
if(f->shared->root_grp) {
- /* Free the ID to name buffer */
- if(H5G_free_grp_name(f->shared->root_grp) < 0)
- /* Push error, but keep going*/
- HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
-
- /* Free the memory for the root group */
- if(H5G_free(f->shared->root_grp) < 0)
+ /* Free the root group */
+ if(H5G_root_free(f->shared->root_grp) < 0)
/* Push error, but keep going*/
HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
f->shared->root_grp = NULL;