summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmu <kmu@hdfgroup.org>2019-12-10 18:10:49 (GMT)
committerkmu <kmu@hdfgroup.org>2019-12-10 18:10:49 (GMT)
commita00d71b2e26c06a299ac92552b7887ca017fd4d3 (patch)
treec77c76dd367cce1cd90306daa8b3f1449c400715
parent62badd9ebcda1d5c723750cccb09204836df9dd7 (diff)
downloadhdf5-a00d71b2e26c06a299ac92552b7887ca017fd4d3.zip
hdf5-a00d71b2e26c06a299ac92552b7887ca017fd4d3.tar.gz
hdf5-a00d71b2e26c06a299ac92552b7887ca017fd4d3.tar.bz2
change according to previous comments
-rw-r--r--src/H5C.c3
-rw-r--r--src/H5Dchunk.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/H5C.c b/src/H5C.c
index 3e0cf95..d6e2147 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -3856,7 +3856,7 @@ H5C__unpin_entry_real(H5C_t *cache_ptr, H5C_cache_entry_t *entry_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_STATIC
+ FUNC_ENTER_STATIC_NOERR
/* Sanity checking */
HDassert(cache_ptr);
@@ -3873,7 +3873,6 @@ H5C__unpin_entry_real(H5C_t *cache_ptr, H5C_cache_entry_t *entry_ptr,
/* Update the stats for an unpin operation */
H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
-done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5C__unpin_entry_real() */
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 2f95024..db234bb 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) {
- hssize_t schunk_points; /* Number of elements in chunk selection */
+ hsize_t schunk_points; /* Number of elements in chunk selection */
hsize_t tmp_count = 1;
/* Get pointer to chunk's information */
@@ -2190,7 +2190,7 @@ 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)
HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "can't create chunk memory selection")