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/H5R.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/H5R.c')
| -rw-r--r-- | src/H5R.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -891,9 +891,8 @@ H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_ty done: /* Close file ID used for search */ - if(file_id > 0) - if(H5I_dec_ref(file_id, FALSE, FALSE) < 0) - HDONE_ERROR(H5E_REFERENCE, H5E_CANTCLOSEFILE, FAIL, "can't determine name") + if(file_id > 0 && H5I_dec_ref(file_id) < 0) + HDONE_ERROR(H5E_REFERENCE, H5E_CANTDEC, FAIL, "can't decrement ref count of temp ID") FUNC_LEAVE_NOAPI(ret_value) } /* end H5R_get_name() */ |