diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2019-01-02 20:28:40 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2019-01-02 20:28:40 (GMT) |
| commit | 2713fb12b12c7d9c9a418494ac8c8c2b4ce93b88 (patch) | |
| tree | 0521ea7663998496259b38c68cabd5bd0af9f34e /src/H5Dpkg.h | |
| parent | 600d44292bfbce3f6d6226260a654555278ef24b (diff) | |
| parent | 74a3710a996fca5ed7fcb4dd8919a7a8521de1de (diff) | |
| download | hdf5-2713fb12b12c7d9c9a418494ac8c8c2b4ce93b88.zip hdf5-2713fb12b12c7d9c9a418494ac8c8c2b4ce93b88.tar.gz hdf5-2713fb12b12c7d9c9a418494ac8c8c2b4ce93b88.tar.bz2 | |
Merge pull request #1380 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_bmr:hdf5_1_10 to hdf5_1_10
This is merged now so it can be tested.
* commit '74a3710a996fca5ed7fcb4dd8919a7a8521de1de':
Revised per review. Description: Changed H5EA_iterate and H5FA_iterate as suggested. Platforms tested: Linux/64 (jelly) Linux/64 (platypus) Darwin (osx1010test)
Addressed HDFFV-10661 Description: - Fixed a bug triggered by tests in chunk_info.c. The returned value from a callback function was not checked in H5EA_iterate(), H5FA_iterate(), and H5D__none_idx_iterate(). This oversight caused a callback function to continue iterating even though it's supposed to stop. Vailin confirmed. - Addressed review comments and made various improvements on the tests. Platforms tested: Linux/64 (jelly) Linux/64 (platypus) Darwin (osx1010test)
Diffstat (limited to 'src/H5Dpkg.h')
| -rw-r--r-- | src/H5Dpkg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h index 4409142..da74d11 100644 --- a/src/H5Dpkg.h +++ b/src/H5Dpkg.h @@ -565,7 +565,7 @@ H5_DLL herr_t H5D__get_storage_size(const H5D_t *dset, hsize_t *storage_size); H5_DLL herr_t H5D__get_chunk_storage_size(H5D_t *dset, const hsize_t *offset, hsize_t *storage_size); H5_DLL herr_t H5D__get_num_chunks(const H5D_t *dset, const H5S_t *space, hsize_t *nchunks); -H5_DLL herr_t H5D__get_chunk_info(const H5D_t *dset, const H5S_t *space, hsize_t index, hsize_t *coord, unsigned *filter_mask, haddr_t *offset, hsize_t *size); +H5_DLL herr_t H5D__get_chunk_info(const H5D_t *dset, const H5S_t *space, hsize_t chk_idx, hsize_t *coord, unsigned *filter_mask, haddr_t *offset, hsize_t *size); H5_DLL herr_t H5D__get_chunk_info_by_coord(const H5D_t *dset, const hsize_t *coord, unsigned *filter_mask, haddr_t *addr, hsize_t *size); H5_DLL haddr_t H5D__get_offset(const H5D_t *dset); H5_DLL void *H5D__vlen_get_buf_size_alloc(size_t size, void *info); |