diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-04 04:26:12 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-04 04:26:12 (GMT) |
| commit | bd7499db1fb2c73352943c2d365c71a8cce7421b (patch) | |
| tree | 4d24f041093576319f9357d5714e39398d7b7511 /src/H5F.c | |
| parent | 16f45fc25a3b24eab31ac846cde0851179e3d7bf (diff) | |
| download | hdf5-bd7499db1fb2c73352943c2d365c71a8cce7421b.zip hdf5-bd7499db1fb2c73352943c2d365c71a8cce7421b.tar.gz hdf5-bd7499db1fb2c73352943c2d365c71a8cce7421b.tar.bz2 | |
[svn-r20407] Description:
Bring r20406 from trunk to 1.8 branch:
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:
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5F.c')
| -rw-r--r-- | src/H5F.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -1047,13 +1047,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; |