diff options
| author | kmu <kmu@hdfgroup.org> | 2019-12-11 16:44:56 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-12-11 16:44:56 (GMT) |
| commit | 45a62b2d46523c15a7d2bc7f52db2b756b40df26 (patch) | |
| tree | 9be754803238d1c98cde34ca9d23b3b6e3e7651b /src/H5Dchunk.c | |
| parent | a00d71b2e26c06a299ac92552b7887ca017fd4d3 (diff) | |
| download | hdf5-45a62b2d46523c15a7d2bc7f52db2b756b40df26.zip hdf5-45a62b2d46523c15a7d2bc7f52db2b756b40df26.tar.gz hdf5-45a62b2d46523c15a7d2bc7f52db2b756b40df26.tar.bz2 | |
fix and address comments
Diffstat (limited to 'src/H5Dchunk.c')
| -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 db234bb..66b6676 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2179,7 +2179,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 */ + hsize_t chunk_points; /* Number of elements in chunk selection */ hsize_t tmp_count = 1; /* Get pointer to chunk's information */ @@ -2190,12 +2190,12 @@ 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 = H5S_GET_SELECT_NPOINTS(chunk_info->fspace); + chunk_points = (hsize_t)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, &chunk_points) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "can't create chunk memory selection") - mem_sel_start[0] += schunk_points; + mem_sel_start[0] += chunk_points; /* Get the next chunk node in the skip list */ curr_node = H5SL_next(curr_node); @@ -5665,7 +5665,6 @@ H5D__chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) H5D_chunk_it_ud2_t *udata = (H5D_chunk_it_ud2_t *)_udata; /* User data for callback */ unsigned rank = udata->common.layout->ndims - 1; /* # of dimensions of dataset */ hsize_t chunk_index; - int ret_value = H5_ITER_CONT; /* Return value */ FUNC_ENTER_STATIC_NOERR @@ -5675,7 +5674,7 @@ H5D__chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) /* Set it in the userdata to return */ udata->chunk_addr[chunk_index] = chunk_rec->chunk_addr; - FUNC_LEAVE_NOAPI(ret_value) + FUNC_LEAVE_NOAPI(H5_ITER_CONT) } /* H5D__chunk_addrmap_cb() */ |