summaryrefslogtreecommitdiffstats
path: root/src/H5G.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-09-16 14:15:13 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-09-16 14:15:13 (GMT)
commit9f028ea4589cfd21ce610050c75895ed69b2ee08 (patch)
tree9eea3e34c3604d6506d6b2d3ee9af6244e659ec0 /src/H5G.c
parent6fb5f819a51f27ffc44b21e2d0e44808ba71da17 (diff)
downloadhdf5-9f028ea4589cfd21ce610050c75895ed69b2ee08.zip
hdf5-9f028ea4589cfd21ce610050c75895ed69b2ee08.tar.gz
hdf5-9f028ea4589cfd21ce610050c75895ed69b2ee08.tar.bz2
[svn-r19399] Description:
Bring r19398 from trunk to 1.8 branch: Clean up the internal usage H5I_dec_ref() to eliminate the sequence of flags that has been creeping in. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Diffstat (limited to 'src/H5G.c')
-rw-r--r--src/H5G.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/H5G.c b/src/H5G.c
index 295ed48..0b42324 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -504,7 +504,8 @@ H5Gget_create_plist(hid_t group_id)
done:
if(ret_value < 0) {
if(new_gcpl_id > 0)
- (void)H5I_dec_ref(new_gcpl_id, TRUE, FALSE);
+ if(H5I_dec_app_ref(new_gcpl_id) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CANTDEC, FAIL, "can't free")
} /* end if */
FUNC_LEAVE_API(ret_value)
@@ -714,7 +715,7 @@ H5Gclose(hid_t group_id)
* Decrement the counter on the group atom. It will be freed if the count
* reaches zero.
*/
- if(H5I_dec_ref(group_id, TRUE, FALSE) < 0)
+ if(H5I_dec_app_ref(group_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
done:
@@ -1536,7 +1537,7 @@ H5G_iterate(hid_t loc_id, const char *group_name,
done:
/* Release the group opened */
if(gid > 0) {
- if(H5I_dec_ref(gid, TRUE, FALSE) < 0)
+ if(H5I_dec_app_ref(gid) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
} /* end if */
else if(grp && H5G_close(grp) < 0)
@@ -1869,7 +1870,7 @@ done:
/* Release the group opened */
if(gid > 0) {
- if(H5I_dec_ref(gid, TRUE, FALSE) < 0)
+ if(H5I_dec_app_ref(gid) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
} /* end if */
else if(grp && H5G_close(grp) < 0)