diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-01-13 14:14:38 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-01-13 14:14:38 (GMT) |
| commit | a3605cbdeb5f79c5753b848dfef1706988ba10e7 (patch) | |
| tree | a27678d0e33455a6c165425704122f3091c853cd /src/H5Dscatgath.c | |
| parent | 089afc48561ba8838d6a515c6b00fc6f7032ca13 (diff) | |
| download | hdf5-a3605cbdeb5f79c5753b848dfef1706988ba10e7.zip hdf5-a3605cbdeb5f79c5753b848dfef1706988ba10e7.tar.gz hdf5-a3605cbdeb5f79c5753b848dfef1706988ba10e7.tar.bz2 | |
Switch working branch from master to develop
Diffstat (limited to 'src/H5Dscatgath.c')
| -rw-r--r-- | src/H5Dscatgath.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 55111f0..929feb7 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -49,9 +49,6 @@ static herr_t H5D__scatter_file(const H5D_io_info_t *io_info, static size_t H5D__gather_file(const H5D_io_info_t *io_info, const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts, void *buf); -static size_t H5D__gather_mem(const void *_buf, - const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts, - const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf/*out*/); static herr_t H5D__compound_opt_read(size_t nelmts, const H5S_t *mem_space, H5S_sel_iter_t *iter, const H5D_dxpl_cache_t *dxpl_cache, const H5D_type_info_t *type_info, void *user_buf/*out*/); @@ -305,6 +302,7 @@ H5D__scatter_mem (const void *_tscat_buf, const H5S_t *space, HDassert(space); HDassert(iter); HDassert(nelmts > 0); + HDassert(dxpl_cache); HDassert(buf); /* Allocate the vector I/O arrays */ @@ -366,7 +364,7 @@ done: * *------------------------------------------------------------------------- */ -static size_t +size_t H5D__gather_mem(const void *_buf, const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts, const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf/*out*/) @@ -389,6 +387,7 @@ H5D__gather_mem(const void *_buf, const H5S_t *space, HDassert(space); HDassert(iter); HDassert(nelmts > 0); + HDassert(dxpl_cache); HDassert(tgath_buf); /* Allocate the vector I/O arrays */ |