diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2018-05-04 21:37:14 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2018-05-04 21:37:14 (GMT) |
| commit | 2ad049a6411923653365962c826cf59cf801d0d7 (patch) | |
| tree | e8f8441cf03001362edf75bae862ab5b4b93a658 /src/H5Ocache_image.c | |
| parent | 5f702f40b719a05bf2d271797179b368c5fd39c5 (diff) | |
| parent | cc2eea14f6a6532a201dde13af13353d4d73fd92 (diff) | |
| download | hdf5-2ad049a6411923653365962c826cf59cf801d0d7.zip hdf5-2ad049a6411923653365962c826cf59cf801d0d7.tar.gz hdf5-2ad049a6411923653365962c826cf59cf801d0d7.tar.bz2 | |
Merge pull request #1045 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.10/master to 1.10/masterhdf5-1_10_2
* commit 'cc2eea14f6a6532a201dde13af13353d4d73fd92': (1014 commits)
Commit release date changes.
Fix typo in INSTALL_Cygwin.txt
Update references and merge from 1_10
Corrected email address
Commit Barbara's INSTALL* file updates.
Commit Elena's RELEASE.txt edits and Les'/Lori's README.txt revision.
ommit Elena's RELEASE.txt edits and Les'/Lori's README.txt revision.
Remove stray '/'.
Add subdirectory for CMake-HDF5-1.10.2.zip.
Correct name of hl compile script
Add directory in release CMake...tar.gz file.
Minor edits in RELEASE.txt. Set version for HDF5 1.10.2 release.
release branch should not generate headers
Switch default build mode to production. Set version to 1.10.2-pre2..
HDFF5-1.10.2-pre1 releaseed. Add links for security bug fixes to RELEASE.txt.
Fix VS2017 binary readme
Couple fixes to the test routine for HDFFV-10425.
Add test and release info for the fix to HDFFV-10425 test failure with H5DOwrite_chunk.
Updated RELEASE.txt
Remove known probelem that was fixed.
...
Diffstat (limited to 'src/H5Ocache_image.c')
| -rw-r--r-- | src/H5Ocache_image.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Ocache_image.c b/src/H5Ocache_image.c index 29b2503..d2b65bb 100644 --- a/src/H5Ocache_image.c +++ b/src/H5Ocache_image.c @@ -38,7 +38,7 @@ /* Callbacks for message class */ static void *H5O__mdci_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, - unsigned mesg_flags, unsigned *ioflags, const uint8_t *p); + unsigned mesg_flags, unsigned *ioflags, size_t p_size, const uint8_t *p); static herr_t H5O__mdci_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); static void *H5O__mdci_copy(const void *_mesg, void *_dest); @@ -99,7 +99,7 @@ H5FL_DEFINE(H5O_mdci_t); static void * H5O__mdci_decode(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, - unsigned H5_ATTR_UNUSED *ioflags, const uint8_t *p) + unsigned H5_ATTR_UNUSED *ioflags, size_t H5_ATTR_UNUSED p_size, const uint8_t *p) { H5O_mdci_t *mesg; /* Native message */ void *ret_value = NULL; /* Return value */ @@ -323,7 +323,7 @@ H5O__mdci_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg) * time constraints, I don't want to go there now. */ if(H5F_FIRST_ALLOC_DEALLOC(f)) { - HDassert(HADDR_UNDEF !=H5F_EOA_PRE_FSM_FSALLOC(f)); + HDassert(HADDR_UNDEF != H5F_EOA_PRE_FSM_FSALLOC(f)); HDassert(H5F_addr_ge(mesg->addr, H5F_EOA_PRE_FSM_FSALLOC(f))); if(H5MF_tidy_self_referential_fsm_hack(f, dxpl_id) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "tidy of self referential fsm hack failed") |