summaryrefslogtreecommitdiffstats
path: root/src/H5FD.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2014-07-30 20:55:14 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2014-07-30 20:55:14 (GMT)
commit33ea1ada248725e4cce6316c503e5c760bcca49c (patch)
tree3fd7e951132e6aa9b7d241a418505d3ae6e33587 /src/H5FD.c
parent3f701fda6528be0844afa2315c2a28357591349a (diff)
downloadhdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.zip
hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.gz
hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.bz2
[svn-r25496] Description:
Merge 64-bit ID changes from branch to trunk. (Plus a few minor cleanups that aren't on the branch) Tested on: Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN (h5committested on branch already for a week)
Diffstat (limited to 'src/H5FD.c')
-rw-r--r--src/H5FD.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/H5FD.c b/src/H5FD.c
index be7f307..c556cd0 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -200,16 +200,22 @@ H5FD_term_interface(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
- if((n=H5I_nmembers(H5I_VFL))!=0) {
- H5I_clear_type(H5I_VFL, FALSE, FALSE);
- } else {
- H5I_dec_type_ref(H5I_VFL);
+ if(H5I_nmembers(H5I_VFL) > 0) {
+ (void)H5I_clear_type(H5I_VFL, FALSE, FALSE);
+ n++; /*H5I*/
+ } /* end if */
+ else {
+ /* Destroy the VFL driver id group */
+ (void)H5I_dec_type_ref(H5I_VFL);
+ n++; /*H5I*/
+
+ /* Mark closed */
H5_interface_initialize_g = 0;
- n = 1; /*H5I*/
- }
- }
+ } /* end else */
+ } /* end if */
+
FUNC_LEAVE_NOAPI(n)
-}
+} /* end H5FD_term_interface() */
/*-------------------------------------------------------------------------