diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-07-31 21:31:36 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-07-31 21:31:36 (GMT) |
commit | a42ea0be91c25d90427678d548bcff17b032d2ca (patch) | |
tree | d00896d7f1bf6cc2b9696c30d675461ccf00149e /src/H5F.c | |
parent | 0cff4f0d146e6beafa4c6b6d4047e489719670f6 (diff) | |
parent | beb6f83cfd696e835970091f730a23db31381455 (diff) | |
download | hdf5-a42ea0be91c25d90427678d548bcff17b032d2ca.zip hdf5-a42ea0be91c25d90427678d548bcff17b032d2ca.tar.gz hdf5-a42ea0be91c25d90427678d548bcff17b032d2ca.tar.bz2 |
[svn-r25502] merge from trunk.
Diffstat (limited to 'src/H5F.c')
-rw-r--r-- | src/H5F.c | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -163,23 +163,28 @@ H5F_term_interface(void) FUNC_ENTER_NOAPI_NOINIT_NOERR if(H5_interface_initialize_g) { - if((n = H5I_nmembers(H5I_FILE)) != 0) { - H5I_clear_type(H5I_FILE, FALSE, FALSE); - } else { + if(H5I_nmembers(H5I_FILE) > 0) { + (void)H5I_clear_type(H5I_FILE, FALSE, FALSE); + n++; /*H5I*/ + } /* end if */ + else { /* Make certain we've cleaned up all the shared file objects */ H5F_sfile_assert_num(0); /* Close deprecated interface */ n += H5F__term_deprec_interface(); - H5I_dec_type_ref(H5I_FILE); + /* Destroy the file object id group */ + (void)H5I_dec_type_ref(H5I_FILE); + n++; /*H5I*/ + + /* Mark closed */ H5_interface_initialize_g = 0; - n = 1; /*H5I*/ } /* end else */ } /* end if */ FUNC_LEAVE_NOAPI(n) -} /* H5F_term_interface() */ +} /* end H5F_term_interface() */ /*------------------------------------------------------------------------- |