diff options
| author | kmu <kmu@hdfgroup.org> | 2019-11-26 23:23:58 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-11-26 23:23:58 (GMT) |
| commit | 2bb0f52edfdd0ce11595ee673a934f306ca5c4fa (patch) | |
| tree | 9be4fa9e5b48e88f993723daf1b13ebd03219f66 /src/H5Dchunk.c | |
| parent | 4c8a2f726a2eb47a937430e28994db8be1b87b00 (diff) | |
| download | hdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.zip hdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.tar.gz hdf5-2bb0f52edfdd0ce11595ee673a934f306ca5c4fa.tar.bz2 | |
Revert "fix issues from previous PR comments"
This reverts commit d242a900f420b040e364f6c0976c01593e955db3.
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index d28beb8..ecb0f9c 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2180,7 +2180,7 @@ H5D__create_chunk_mem_map_1d(const H5D_chunk_map_t *fm) /* Iterate over each chunk in the chunk list */ curr_node = H5SL_first(fm->sel_chunks); while(curr_node) { - hsize_t schunk_points; /* Number of elements in chunk selection */ + hssize_t schunk_points; /* Number of elements in chunk selection */ hsize_t tmp_count = 1; /* Get pointer to chunk's information */ @@ -2191,9 +2191,9 @@ H5D__create_chunk_mem_map_1d(const H5D_chunk_map_t *fm) if((chunk_info->mspace = H5S_copy(fm->mem_space, TRUE, FALSE)) == NULL) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "unable to copy memory space") - schunk_points = (hsize_t)H5S_GET_SELECT_NPOINTS(chunk_info->fspace); + schunk_points = H5S_GET_SELECT_NPOINTS(chunk_info->fspace); - if(H5S_select_hyperslab(chunk_info->mspace, H5S_SELECT_SET, mem_sel_start, NULL, &tmp_count, &schunk_points) < 0) + if(H5S_select_hyperslab(chunk_info->mspace, H5S_SELECT_SET, mem_sel_start, NULL, &tmp_count, &(const hsize_t)schunk_points) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "can't create chunk memory selection") mem_sel_start[0] += schunk_points; @@ -5668,7 +5668,7 @@ H5D__chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) hsize_t chunk_index; int ret_value = H5_ITER_CONT; /* Return value */ - FUNC_ENTER_STATIC_NOERR + FUNC_ENTER_STATIC /* Compute the index for this chunk */ chunk_index = H5VM_array_offset_pre(rank, udata->common.layout->down_chunks, chunk_rec->scaled); |