diff options
author | mainzer <mainzer#hdfgroup.org> | 2020-08-15 22:53:29 (GMT) |
---|---|---|
committer | mainzer <mainzer#hdfgroup.org> | 2020-08-15 22:53:29 (GMT) |
commit | 7b9f61c1575c53efb996f6934262f17f7870ddc6 (patch) | |
tree | bc0dda3552843fcac2e868678c93469a479bf14c /src/H5Shyper.c | |
parent | 12bb6d7665b484854042db5da026a9910d711e32 (diff) | |
parent | 044ee6f88c78a70eb3694d8c73fa74c77fde9689 (diff) | |
download | hdf5-7b9f61c1575c53efb996f6934262f17f7870ddc6.zip hdf5-7b9f61c1575c53efb996f6934262f17f7870ddc6.tar.gz hdf5-7b9f61c1575c53efb996f6934262f17f7870ddc6.tar.bz2 |
Merge branch 'develop' into mdc_sl_opt
Diffstat (limited to 'src/H5Shyper.c')
-rw-r--r-- | src/H5Shyper.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 9f75785..95bce29 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -5405,7 +5405,7 @@ H5S__hyper_spans_shape_same_helper(const H5S_hyper_span_info_t *span_info1, { hbool_t ret_value = TRUE; /* Return value */ - FUNC_ENTER_PACKAGE_NOERR + FUNC_ENTER_STATIC_NOERR /* Sanity checks */ HDassert(span_info1); @@ -7017,9 +7017,8 @@ H5S__hyper_adjust_s(H5S_t *space, const hssize_t *offset) { hbool_t non_zero_offset = FALSE; /* Whether any offset is non-zero */ unsigned u; /* Local index variable */ - herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(FAIL) + FUNC_ENTER_STATIC_NOERR /* Sanity checks */ HDassert(space); @@ -7062,8 +7061,7 @@ H5S__hyper_adjust_s(H5S_t *space, const hssize_t *offset) } /* end if */ } -done: - FUNC_LEAVE_NOAPI(ret_value) + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5S__hyper_adjust_s() */ @@ -9613,7 +9611,7 @@ H5S__hyper_regular_and_single_block(H5S_t *space, const hsize_t start[], unsigned u; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(FAIL) + FUNC_ENTER_STATIC /* Check args */ HDassert(space); |