diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-27 14:50:38 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-27 14:50:38 (GMT) |
| commit | adb2fd1cc0858602046959689377dbdb60a4c3a6 (patch) | |
| tree | 3d2ea72ca7ba9c2502d9c2230d261acd9fe7c95d /src/H5Fint.c | |
| parent | 9f69967286c1014355421b02db986303de1cfcda (diff) | |
| parent | ebc0b44fe18a40b7f31bdde45ec9f16edd4f658a (diff) | |
| download | hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.zip hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.tar.gz hdf5-adb2fd1cc0858602046959689377dbdb60a4c3a6.tar.bz2 | |
[svn-r24208] Merge revisions through r24202 from trunk to vol branch
Tested: jam, koala, ostrich, platypus (h5committest)
There are failures on platypus (cmake) that were present previously
Diffstat (limited to 'src/H5Fint.c')
| -rw-r--r-- | src/H5Fint.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c index 404aaab..21692e5 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -588,6 +588,7 @@ htri_t H5F_is_hdf5(const char *name) { H5FD_t *file = NULL; /* Low-level file struct */ + haddr_t sig_addr; /* Addess of hdf5 file signature */ htri_t ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -597,7 +598,9 @@ H5F_is_hdf5(const char *name) HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to open file") /* The file is an hdf5 file if the hdf5 file signature can be found */ - ret_value = (HADDR_UNDEF != H5F_locate_signature(file, H5AC_ind_dxpl_id)); + if(H5F_locate_signature(file, H5AC_ind_dxpl_id, &sig_addr) < 0) + HGOTO_ERROR(H5E_FILE, H5E_NOTHDF5, FAIL, "unable to locate file signature") + ret_value = (HADDR_UNDEF != sig_addr); done: /* Close the file */ |