summaryrefslogtreecommitdiffstats
path: root/src/H5Fint.c
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2019-06-19 21:43:23 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2019-06-19 21:43:23 (GMT)
commit246b40f8f815308b929e55279e30887ffec7b8e4 (patch)
treec4e1c262f112a498aeb54090d90e39f97ffca026 /src/H5Fint.c
parent82f656aed0beed3b40e682f51e979e8e20ccde74 (diff)
parentca1ee7fae118c8d4137b1b5efe57660d2e0ff9b1 (diff)
downloadhdf5-246b40f8f815308b929e55279e30887ffec7b8e4.zip
hdf5-246b40f8f815308b929e55279e30887ffec7b8e4.tar.gz
hdf5-246b40f8f815308b929e55279e30887ffec7b8e4.tar.bz2
Merge pull request #6 in ~VCHOI/my_third_fork from develop to bugfix/new_shutdown_fsm
* commit 'ca1ee7fae118c8d4137b1b5efe57660d2e0ff9b1': (64 commits) Fix memory leak in objcopy test after H5Aread of vlen data HDFFV-10616 add h5fc script Fixed a problem in the ohdr test where hard-coded strings passed to H5Awrite() triggered -fsanitize failures. Yanked qsort assert Switched to HGOTO_DONE() in the links code. Updated the HDqsort() macro to ensure we don't pass NULL buffers to qsort(3) in the future. Fixed a bug in the links code where iterating over an empty group would pass a NULL pointer to qsort(3), which is undefined behavior. Reset the other convenience pointer because why no Fixed a memory bug where a pointer is used after it's been freed. fixed pass_through vol HDFFV-10805 Add option to only build shared targets Fixed a warning in H5CX.c concerning incorrect use of freeing VOL connector info. Add H5S_SEL_ITER_SHARE_WITH_DATASPACE selection iterator creation flag, to share dataspace's selection with iterator (and with caution about not modifying or closing the dataspace while the iterator is open). Added a warning summary script for gcc to bin Fix misc. typos, etc. from code review Fixed problem with H5Fdelete "test" and split VFD. New hyperslab selection routines and new public selection iterator routines. Added the creation and use of an attribute access property list to testhdf5. Update MANIFEST for move of h5cc.in and h5redeploy.in to bin directory. Added missing DELETE enum value. ...
Diffstat (limited to 'src/H5Fint.c')
-rw-r--r--src/H5Fint.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 2e8771c..ee9afed 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -863,7 +863,7 @@ H5F__is_hdf5(const char *name, hid_t fapl_id)
* should work with arbitrary VFDs, unlike H5Fis_hdf5().
*/
if(NULL == (file = H5FD_open(name, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF)))
- HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to open file")
+ HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to open file")
/* The file is an hdf5 file if the hdf5 file signature can be found */
if(H5FD_locate_signature(file, &sig_addr) < 0)
@@ -874,7 +874,7 @@ done:
/* Close the file */
if(file)
if(H5FD_close(file) < 0 && TRUE == ret_value)
- HDONE_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
+ HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__is_hdf5() */