diff options
| author | kmu <kmu@hdfgroup.org> | 2019-12-11 19:35:02 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-12-11 19:35:02 (GMT) |
| commit | 0a2bb11b248df6841daabca3970df5d8504adfc7 (patch) | |
| tree | 5c431dcf2a63c852126b6d537f13b02c249d26fb | |
| parent | 45a62b2d46523c15a7d2bc7f52db2b756b40df26 (diff) | |
| download | hdf5-0a2bb11b248df6841daabca3970df5d8504adfc7.zip hdf5-0a2bb11b248df6841daabca3970df5d8504adfc7.tar.gz hdf5-0a2bb11b248df6841daabca3970df5d8504adfc7.tar.bz2 | |
address problems from comments
| -rw-r--r-- | src/H5C.c | 1 | ||||
| -rw-r--r-- | src/H5Dchunk.c | 2 | ||||
| -rw-r--r-- | src/H5Sprivate.h | 2 | ||||
| -rw-r--r-- | src/H5Sselect.c | 4 | ||||
| -rw-r--r-- | test/cache_tagging.c | 2 | ||||
| -rw-r--r-- | tools/src/h5import/h5import.c | 2 |
6 files changed, 6 insertions, 7 deletions
@@ -3873,6 +3873,7 @@ 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 66b6676..67f42f1 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -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") - chunk_points = (hsize_t)H5S_GET_SELECT_NPOINTS(chunk_info->fspace); + chunk_points = H5S_GET_SELECT_NPOINTS(chunk_info->fspace); 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") diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index f29319f..a61c505 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -238,7 +238,7 @@ H5_DLL herr_t H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *spac H5_DLL herr_t H5S_select_fill(const void *fill, size_t fill_size, const H5S_t *space, void *buf); H5_DLL htri_t H5S_select_valid(const H5S_t *space); -H5_DLL hssize_t H5S_get_select_npoints(const H5S_t *space); +H5_DLL hsize_t H5S_get_select_npoints(const H5S_t *space); H5_DLL herr_t H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); H5_DLL herr_t H5S_get_select_offset(const H5S_t *space, hsize_t *offset); H5_DLL int H5S_get_select_unlim_dim(const H5S_t *space); diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 6c8b898..9814e38 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -431,7 +431,7 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -H5_ATTR_PURE hssize_t +H5_ATTR_PURE hsize_t H5S_get_select_npoints(const H5S_t *space) { FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -439,7 +439,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) } /* end H5S_get_select_npoints() */ diff --git a/test/cache_tagging.c b/test/cache_tagging.c index dad9426..7ce4e88 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -3836,14 +3836,12 @@ check_invalid_tag_application(void) return 0; -#if 0 error: #if H5C_DO_TAGGING_SANITY_CHECKS if(api_ctx_pushed) H5CX_pop(); #endif /* H5C_DO_TAGGING_SANITY_CHECKS */ return 1; -#endif } /* check_invalid_tag_application */ diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c index f2e264c..bd1689f 100644 --- a/tools/src/h5import/h5import.c +++ b/tools/src/h5import/h5import.c @@ -4714,7 +4714,7 @@ uint16_t swap_uint16(uint16_t val) int16_t swap_int16(int16_t val) { - return (uint16_t)((val << 8) | ((val >> 8) & 0xFF)); + return (int16_t)((val << 8) | ((val >> 8) & 0xFF)); } uint32_t swap_uint32(uint32_t val) |