summaryrefslogtreecommitdiffstats
path: root/src/H5AC.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/H5AC.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/H5AC.c')
-rw-r--r--src/H5AC.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5AC.c b/src/H5AC.c
index 64c2318..4f85303 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -374,26 +374,26 @@ done:
int
H5AC_term_interface(void)
{
- int n=0;
+ int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface)
if (H5_interface_initialize_g) {
#ifdef H5_HAVE_PARALLEL
- if(H5AC_dxpl_id>0 || H5AC_noblock_dxpl_id>0 || H5AC_ind_dxpl_id>0) {
+ if(H5AC_dxpl_id > 0 || H5AC_noblock_dxpl_id > 0 || H5AC_ind_dxpl_id > 0) {
/* Indicate more work to do */
n = 1; /* H5I */
/* Close H5AC dxpl */
- if (H5I_dec_ref(H5AC_dxpl_id, FALSE, FALSE) < 0 ||
- H5I_dec_ref(H5AC_noblock_dxpl_id, FALSE, FALSE) < 0 ||
- H5I_dec_ref(H5AC_ind_dxpl_id, FALSE, FALSE) < 0)
+ if(H5I_dec_ref(H5AC_dxpl_id) < 0 ||
+ H5I_dec_ref(H5AC_noblock_dxpl_id) < 0 ||
+ H5I_dec_ref(H5AC_ind_dxpl_id) < 0)
H5E_clear_stack(NULL); /*ignore error*/
else {
/* Reset static IDs */
- H5AC_dxpl_id=(-1);
- H5AC_noblock_dxpl_id=(-1);
- H5AC_ind_dxpl_id=(-1);
+ H5AC_dxpl_id = (-1);
+ H5AC_noblock_dxpl_id = (-1);
+ H5AC_ind_dxpl_id = (-1);
/* Reset interface initialization flag */
H5_interface_initialize_g = 0;