From 1077a767ff3885dd23bdbfdfba51037c925ce23c Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 22 Aug 2020 14:43:46 -0500 Subject: Minor fixes to align w/state of 1.12 code --- src/H5Tref.c | 1 - src/H5VMprivate.h | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/H5Tref.c b/src/H5Tref.c index 054cd6a..a79abcf 100644 --- a/src/H5Tref.c +++ b/src/H5Tref.c @@ -1221,7 +1221,6 @@ H5T__ref_reclaim(void *elem, const H5T_t *dt) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_PACKAGE - H5T_REF_LOG_DEBUG(""); /* Sanity checks */ HDassert(elem); diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h index e784847..5c975f6 100644 --- a/src/H5VMprivate.h +++ b/src/H5VMprivate.h @@ -164,8 +164,8 @@ H5VM_vector_reduce_product(unsigned n, const hsize_t *v) { hsize_t ret_value = 1; - /* Use FUNC_ENTER_STATIC_NOERR here to avoid performance issues */ - FUNC_ENTER_STATIC_NOERR + /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOERR if (n && !v) HGOTO_DONE(0) while (n--) ret_value *= *v++; @@ -198,8 +198,8 @@ H5VM_vector_zerop_u(int n, const hsize_t *v) { htri_t ret_value=TRUE; /* Return value */ - /* Use FUNC_ENTER_STATIC_NOERR here to avoid performance issues */ - FUNC_ENTER_STATIC_NOERR + /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOERR if (!v) HGOTO_DONE(TRUE) @@ -235,8 +235,8 @@ H5VM_vector_zerop_s(int n, const hssize_t *v) { htri_t ret_value=TRUE; /* Return value */ - /* Use FUNC_ENTER_STATIC_NOERR here to avoid performance issues */ - FUNC_ENTER_STATIC_NOERR + /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOERR if (!v) HGOTO_DONE(TRUE) @@ -274,8 +274,8 @@ H5VM_vector_cmp_u(unsigned n, const hsize_t *v1, const hsize_t *v2) { int ret_value=0; /* Return value */ - /* Use FUNC_ENTER_STATIC_NOERR here to avoid performance issues */ - FUNC_ENTER_STATIC_NOERR + /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOERR if (v1 == v2) HGOTO_DONE(0) if (v1 == NULL) HGOTO_DONE(-1) @@ -318,8 +318,8 @@ H5VM_vector_cmp_s(unsigned n, const hssize_t *v1, const hssize_t *v2) { int ret_value=0; /* Return value */ - /* Use FUNC_ENTER_STATIC_NOERR here to avoid performance issues */ - FUNC_ENTER_STATIC_NOERR + /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */ + FUNC_ENTER_NOAPI_NOINIT_NOERR if (v1 == v2) HGOTO_DONE(0) if (v1 == NULL) HGOTO_DONE(-1) -- cgit v0.12