diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2019-11-26 17:38:25 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2019-11-26 17:38:25 (GMT) |
| commit | 9f61c26927ac74c4498cbebd7c9f2166d5f5b786 (patch) | |
| tree | 81df83e8c53a80b61365d579b26aeb9532fe493f /src/H5Dchunk.c | |
| parent | 5f3414e4d908fcdc8f3d31c624c4c157d87161e8 (diff) | |
| parent | 4e12984b77cdd7615843d94f8de8d54db27476ac (diff) | |
| download | hdf5-9f61c26927ac74c4498cbebd7c9f2166d5f5b786.zip hdf5-9f61c26927ac74c4498cbebd7c9f2166d5f5b786.tar.gz hdf5-9f61c26927ac74c4498cbebd7c9f2166d5f5b786.tar.bz2 | |
Merge pull request #2045 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:select_adjust to develop
* commit '4e12984b77cdd7615843d94f8de8d54db27476ac':
Move checking for zero offset in selection adjust calls to the selection callbacks. This makes the procedure for checking it consistent across selection types and between _s and _u, ensures it is always is performed even when called within the H5S package, and removes the redundant check that would occur when callins H5S_select_adjust_s() from outside the H5S package.
Replace H5Sselect_adjust_u() and H5Shyper_adjust_s() with H5Sselect_adjust. Implement "adjust_s" callback for all selection types. Add range checking to H5Sselect_adjust().
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 947f611..4d139c7 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2115,7 +2115,7 @@ H5D__create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm) } /* end for */ /* Adjust the selection */ - if(H5S_hyper_adjust_s(chunk_info->mspace, chunk_adjust) < 0) + if(H5S_SELECT_ADJUST_S(chunk_info->mspace, chunk_adjust) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to adjust selection") } /* end else */ @@ -2128,7 +2128,6 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5D__create_chunk_mem_map_hyper() */ - /*------------------------------------------------------------------------- * Function: H5D__create_mem_map_1d |