diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-04-07 13:10:56 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-04-07 13:10:56 (GMT) |
| commit | 51e3309491efb4f8a21f23ef5d00b3b5138b7905 (patch) | |
| tree | 96407a4c0d016eb590768df4c402cc00c1802568 /src | |
| parent | a77dec357bc5c19a1101b94a697fee59456b8b78 (diff) | |
| parent | 5c4aeef7ff5845a98f4fea5d2be74aa258cd1562 (diff) | |
| download | hdf5-51e3309491efb4f8a21f23ef5d00b3b5138b7905.zip hdf5-51e3309491efb4f8a21f23ef5d00b3b5138b7905.tar.gz hdf5-51e3309491efb4f8a21f23ef5d00b3b5138b7905.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_8)
* commit '5c4aeef7ff5845a98f4fea5d2be74aa258cd1562':
Fix illegal references for sanity checks. Correct illegal references for HDassert() checks when in debug mode. Tested on emu, osx1010test, mayll, kituo, ostrich.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Dchunk.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index a55a156..ab2cb8f 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -462,8 +462,8 @@ H5D__chunk_direct_read(const H5D_t *dset, hid_t dxpl_id, hsize_t *offset, H5D_rdcc_ent_t *ent = rdcc->slot[udata.idx_hint]; /* Sanity checks */ - HDassert(udata->idx_hint < rdcc->nslots); - HDassert(rdcc->slot[udata->idx_hint]); + HDassert(udata.idx_hint < rdcc->nslots); + HDassert(rdcc->slot[udata.idx_hint]); /* If the cached chunk is dirty, it must be flushed to get accurate size */ if( ent->dirty == TRUE ) { @@ -533,8 +533,7 @@ H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, h /* Check args */ HDassert(dset && H5D_CHUNKED == layout->type); HDassert(offset); - HDassert(filters); - HDassert(buf); + HDassert(storage_size); /* Retrieve the dataset dimensions */ space_ndims = dset->shared->layout.u.chunk.ndims - 1; @@ -571,8 +570,8 @@ H5D__get_chunk_storage_size(H5D_t *dset, hid_t dxpl_id, const hsize_t *offset, h /* Check if the requested chunk exists in the chunk cache */ if(UINT_MAX != udata.idx_hint) { /* Sanity checks */ - HDassert(udata->idx_hint < rdcc->nslots); - HDassert(rdcc->slot[udata->idx_hint]); + HDassert(udata.idx_hint < rdcc->nslots); + HDassert(rdcc->slot[udata.idx_hint]); H5D_rdcc_ent_t *ent = rdcc->slot[udata.idx_hint]; /* If the cached chunk is dirty, it must be flushed to get accurate size */ |