diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2018-04-30 16:05:26 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2018-04-30 16:05:26 (GMT) |
commit | fde2d1fe4a452abe82404bee60e34151acdd186b (patch) | |
tree | 253d779d21ff2d71178472f40ed20214891c6dce /src/H5Snone.c | |
parent | 6fb94eb3a38ea5f6d7253b72f7038ac00f295962 (diff) | |
parent | 1f8cb03e11a46f853881f45dac18eff2dd68401e (diff) | |
download | hdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.zip hdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.tar.gz hdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '1f8cb03e11a46f853881f45dac18eff2dd68401e':
Fix errors in Makefile.am files that cause "make check" to repeat test, even when there are no changes to source files. (Also add a ggenerated script to the list of files cleaned up on 'make distclean')
Further minor cleanups
Checkpoint normalization against incoming hyperslab / selection / dataspace improvements.
Diffstat (limited to 'src/H5Snone.c')
-rw-r--r-- | src/H5Snone.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Snone.c b/src/H5Snone.c index 104b0bb..19d0b5f 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -15,7 +15,7 @@ * Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu> * Tuesday, November 10, 1998 * - * Purpose: "None" selection data space I/O functions. + * Purpose: "None" selection dataspace I/O functions. */ #include "H5Smodule.h" /* This source code file is part of the H5S module */ @@ -47,7 +47,7 @@ static int H5S__none_unlim_dim(const H5S_t *space); static htri_t H5S_none_is_contiguous(const H5S_t *space); static htri_t H5S_none_is_single(const H5S_t *space); static htri_t H5S_none_is_regular(const H5S_t *space); -static herr_t H5S_none_adjust_u(H5S_t *space, const hsize_t *offset); +static void H5S_none_adjust_u(H5S_t *space, const hsize_t *offset); static herr_t H5S_none_project_scalar(const H5S_t *space, hsize_t *offset); static herr_t H5S_none_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset); static herr_t H5S_none_iter_init(H5S_sel_iter_t *iter, const H5S_t *space); @@ -744,11 +744,11 @@ H5S_none_is_regular(const H5S_t H5_ATTR_UNUSED *space) PURPOSE Adjust an "none" selection by subtracting an offset USAGE - herr_t H5S_none_adjust_u(space, offset) + void H5S_none_adjust_u(space, offset) H5S_t *space; IN/OUT: Pointer to dataspace to adjust const hsize_t *offset; IN: Offset to subtract RETURNS - Non-negative on success, negative on failure + None DESCRIPTION Moves selection by subtracting an offset from it. GLOBAL VARIABLES @@ -756,7 +756,7 @@ H5S_none_is_regular(const H5S_t H5_ATTR_UNUSED *space) EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static herr_t +static void H5S_none_adjust_u(H5S_t H5_ATTR_UNUSED *space, const hsize_t H5_ATTR_UNUSED *offset) { FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -765,7 +765,7 @@ H5S_none_adjust_u(H5S_t H5_ATTR_UNUSED *space, const hsize_t H5_ATTR_UNUSED *off HDassert(space); HDassert(offset); - FUNC_LEAVE_NOAPI(FAIL) + FUNC_LEAVE_NOAPI_VOID } /* H5S_none_adjust_u() */ @@ -898,7 +898,7 @@ H5Sselect_none(hid_t spaceid) /* Check args */ if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space") + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace") /* Change to "none" selection */ if(H5S_select_none(space) < 0) |