diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-01-12 04:11:36 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-01-12 04:11:36 (GMT) |
| commit | d92575889bc5a509ba2ac428c2086855edd26b32 (patch) | |
| tree | 90e40f53f83e57f2eb2b5ebf5269484e375fb04b | |
| parent | 441d2a0c66524937af3ba229d21815a3eaf7e265 (diff) | |
| parent | 0708174a0bfe39a701cbd22c16244ed238a54662 (diff) | |
| download | hdf5-d92575889bc5a509ba2ac428c2086855edd26b32.zip hdf5-d92575889bc5a509ba2ac428c2086855edd26b32.tar.gz hdf5-d92575889bc5a509ba2ac428c2086855edd26b32.tar.bz2 | |
Merge pull request #2252 in HDFFV/hdf5 from ~KMU/hdf5:hdf5_1_8 to hdf5_1_8
* commit '0708174a0bfe39a701cbd22c16244ed238a54662':
fix merge error
| -rw-r--r-- | src/H5Dchunk.c | 6 | ||||
| -rw-r--r-- | src/H5Sselect.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index a94dea5..c9dfe87 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -4562,8 +4562,9 @@ 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 + FUNC_ENTER_STATIC /* Compute the index for this chunk */ if(H5VM_chunk_index(rank, chunk_rec->offset, udata->common.layout->dim, udata->common.layout->down_chunks, &chunk_index) < 0) @@ -4572,7 +4573,8 @@ 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(H5_ITER_CONT) +done: + FUNC_LEAVE_NOAPI(ret_value) } /* H5D__chunk_addrmap_cb() */ diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 8615dc5..0055421 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -327,7 +327,7 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -hssize_t +hsize_t H5S_get_select_npoints(const H5S_t *space) { FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -335,7 +335,7 @@ H5S_get_select_npoints(const H5S_t *space) /* Check args */ HDassert(space); - FUNC_LEAVE_NOAPI((hssize_t)space->select.num_elem) + FUNC_LEAVE_NOAPI(space->select.num_elem) } /* H5S_get_select_npoints() */ |