diff options
| author | lrknox <lrknox> | 2018-05-04 21:18:29 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2018-05-04 21:18:29 (GMT) |
| commit | cc2eea14f6a6532a201dde13af13353d4d73fd92 (patch) | |
| tree | e8f8441cf03001362edf75bae862ab5b4b93a658 /src/H5Ocache_image.c | |
| parent | 5f702f40b719a05bf2d271797179b368c5fd39c5 (diff) | |
| parent | bd0de172504724b67cd4000a78efc426a696e9fb (diff) | |
| download | hdf5-cc2eea14f6a6532a201dde13af13353d4d73fd92.zip hdf5-cc2eea14f6a6532a201dde13af13353d4d73fd92.tar.gz hdf5-cc2eea14f6a6532a201dde13af13353d4d73fd92.tar.bz2 | |
Merge tag 'hdf5-1_10_2' into 1.10/master.
Tag revisions for HDF5 1.10.2 release
Commit HDF5 1.10.2 release versions.
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") |