diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-16 14:15:13 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-16 14:15:13 (GMT) |
commit | 9f028ea4589cfd21ce610050c75895ed69b2ee08 (patch) | |
tree | 9eea3e34c3604d6506d6b2d3ee9af6244e659ec0 /src/H5P.c | |
parent | 6fb5f819a51f27ffc44b21e2d0e44808ba71da17 (diff) | |
download | hdf5-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/H5P.c')
-rw-r--r-- | src/H5P.c | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -1379,21 +1379,21 @@ done: herr_t H5Pclose(hid_t plist_id) { - herr_t ret_value=SUCCEED; /* return value */ + herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pclose, FAIL); H5TRACE1("e", "i", plist_id); - if(plist_id==H5P_DEFAULT) - HGOTO_DONE(SUCCEED); - - /* Check arguments. */ - if(H5I_GENPROP_LST != H5I_get_type(plist_id)) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list"); + /* Allow default property lists to pass through without throwing an error */ + if(H5P_DEFAULT != plist_id) { + /* Check arguments. */ + if(H5I_GENPROP_LST != H5I_get_type(plist_id)) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list") - /* Close the property list */ - if(H5I_dec_ref(plist_id, TRUE, FALSE) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't close"); + /* Close the property list */ + if(H5I_dec_app_ref(plist_id) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't close") + } /* end if */ done: FUNC_LEAVE_API(ret_value); @@ -1522,13 +1522,13 @@ H5Pclose_class(hid_t cls_id) /* Check arguments */ if(H5I_GENPROP_CLS != H5I_get_type(cls_id)) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class"); + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class") /* Close the property list class */ - if(H5I_dec_ref(cls_id, TRUE, FALSE) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't close"); + if(H5I_dec_app_ref(cls_id) < 0) + HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't close") done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API(ret_value) } /* H5Pclose_class() */ |