diff options
author | lrknox <lrknox> | 2018-05-11 16:02:43 (GMT) |
---|---|---|
committer | lrknox <lrknox> | 2018-05-11 16:02:43 (GMT) |
commit | aa52644d1f9e5a1103e4f670b56074c4e46a04f2 (patch) | |
tree | 0b38858f2936f4b91b22e392f249151b5ed4c3cc /src/H5Ocache.c | |
parent | 0cd35505fce196095b8ba4254cb76a976c026a1c (diff) | |
download | hdf5-aa52644d1f9e5a1103e4f670b56074c4e46a04f2.zip hdf5-aa52644d1f9e5a1103e4f670b56074c4e46a04f2.tar.gz hdf5-aa52644d1f9e5a1103e4f670b56074c4e46a04f2.tar.bz2 |
Address compile errors and merge conflicts.
Diffstat (limited to 'src/H5Ocache.c')
-rw-r--r-- | src/H5Ocache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Ocache.c b/src/H5Ocache.c index ebae3f5..39f3ca3 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -1288,7 +1288,7 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image, unsigned ioflags = 0; /* Flags for decode routine */ /* Decode continuation message */ - cont = (H5O_cont_t *)(H5O_MSG_CONT->decode)(udata->f, udata->dxpl_id, NULL, 0, &ioflags, oh->mesg[curmesg].raw); + cont = (H5O_cont_t *)(H5O_MSG_CONT->decode)(udata->f, udata->dxpl_id, NULL, 0, &ioflags, oh->mesg[curmesg].raw_size, oh->mesg[curmesg].raw); cont->chunkno = udata->cont_msg_info->nmsgs + 1; /*the next continuation message/chunk */ /* Save 'native' form of continuation message */ @@ -1312,7 +1312,7 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image, /* Decode ref. count message */ HDassert(oh->version > H5O_VERSION_1); - refcount = (H5O_refcount_t *)(H5O_MSG_REFCOUNT->decode)(udata->f, udata->dxpl_id, NULL, 0, &ioflags, oh->mesg[curmesg].raw); + refcount = (H5O_refcount_t *)(H5O_MSG_REFCOUNT->decode)(udata->f, udata->dxpl_id, NULL, 0, &ioflags, oh->mesg[curmesg].raw_size, oh->mesg[curmesg].raw); /* Save 'native' form of ref. count message */ oh->mesg[curmesg].native = refcount; |