diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-26 21:51:35 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2013-09-26 21:51:35 (GMT) |
| commit | e2dfb53df72ca884cb9225e738aef77135f92e68 (patch) | |
| tree | 5141be9364bad05e2c2a8e1ff47e2abed29e5cdd /src/H5Fpkg.h | |
| parent | dd1f4e14c91caf5db3a8e6d81d090c774877d277 (diff) | |
| download | hdf5-e2dfb53df72ca884cb9225e738aef77135f92e68.zip hdf5-e2dfb53df72ca884cb9225e738aef77135f92e68.tar.gz hdf5-e2dfb53df72ca884cb9225e738aef77135f92e68.tar.bz2 | |
[svn-r24204] Port r24140 from trunk to 1.8 branch.
Tested: jam, koala, ostrich, platypus (h5committest)
Log from r24140:
Purpose: Remove problematic abandonment of error stack
Description:
H5Fis_hdf5 uses H5F_locate_signature to check if the file is hdf5. If it does
not locate the signature, H5F_locate_signature would issue an error and return
HADDR_UNDEF. H5Fis_hdf5 does not consider it an error if the signature is not
found, so it does not issue an error or clear the stack. The filled stack could
then cause issues later on.
Changed H5F_locate_signature to return herr_t, not issue an error if the
signature is not found, and added a parameter for a pointer to the signature
address that the function fills in.
Tested: jam, koala, ostrich (h5committest)
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 47e9136..61b3ec6 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -292,7 +292,7 @@ H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1]; /* General routines */ H5_DLL herr_t H5F_init(void); -H5_DLL haddr_t H5F_locate_signature(H5FD_t *file, hid_t dxpl_id); +H5_DLL herr_t H5F_locate_signature(H5FD_t *file, hid_t dxpl_id, haddr_t *sig_addr); H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing); /* File mount related routines */ |