diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2019-03-10 03:41:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2019-03-10 03:41:38 (GMT) |
| commit | deeb302747fe186d18bbf3e47d750ce6e47aef62 (patch) | |
| tree | eb74d361608c829e7a531165378a5af873ff7ad2 /src/H5Fint.c | |
| parent | 679b49d43d744f0cc34054944e827326f17a6f3d (diff) | |
| download | hdf5-deeb302747fe186d18bbf3e47d750ce6e47aef62.zip hdf5-deeb302747fe186d18bbf3e47d750ce6e47aef62.tar.gz hdf5-deeb302747fe186d18bbf3e47d750ce6e47aef62.tar.bz2 | |
Specify the default VOL connector to use with an environment variable.
This implicitly adds support for changing the VOL connector for command-line
tools or any application linked with the library.
Also, add 'make check-vol' support for all directories, clearing up necessary
issues in testing scripts, etc.
Diffstat (limited to 'src/H5Fint.c')
| -rw-r--r-- | src/H5Fint.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c index 8a7019d..339c61b 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -1362,19 +1362,10 @@ H5F__dest(H5F_t *f, hbool_t flush) HDONE_ERROR(H5E_FILE, H5E_CANTDEC, FAIL, "can't close property list") /* Clean up the cached VOL connector ID & info */ - if(f->shared->vol_info) { - H5VL_class_t *connector; /* Pointer to connector */ - - /* Retrieve the connector for the ID */ - if(NULL == (connector = (H5VL_class_t *)H5I_object(f->shared->vol_id))) - /* Push error, but keep going*/ - HDONE_ERROR(H5E_FILE, H5E_BADTYPE, FAIL, "not a VOL connector ID") - - /* Free the connector info */ - if(H5VL_free_connector_info(connector, f->shared->vol_info) < 0) + if(f->shared->vol_info) + if(H5VL_free_connector_info(f->shared->vol_id, f->shared->vol_info) < 0) /* Push error, but keep going*/ HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "unable to release VOL connector info object") - } /* end if */ if(f->shared->vol_id > 0) if(H5I_dec_ref(f->shared->vol_id) < 0) /* Push error, but keep going*/ |