[svn-r21919] Description:

    Refactor function name macros and simplify the FUNC_ENTER macros, to clear
away the cruft and prepare for further cleanups.

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug, production & parallel

1 files changed, 87 insertions, 87 deletions

diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 2622101..1eeb098 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -140,7 +140,7 @@ H5FL_DEFINE_STATIC(H5S_hyper_span_info_t);
 static herr_t
 H5S_hyper_print_spans_helper(FILE *f, struct H5S_hyper_span_t *span,unsigned depth)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_print_spans_helper)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     while(span) {
         HDfprintf(f,"%s: depth=%u, span=%p, (%d, %d), nelem=%u, pstride=%u\n",FUNC,depth,span,(int)span->low,(int)span->high,(unsigned)span->nelem,(unsigned)span->pstride);
@@ -157,7 +157,7 @@ H5S_hyper_print_spans_helper(FILE *f, struct H5S_hyper_span_t *span,unsigned dep
 herr_t
 H5S_hyper_print_spans(FILE *f, const struct H5S_hyper_span_info_t *span_lst)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_print_spans)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(span_lst!=NULL) {
         HDfprintf(f,"%s: spans=%p, count=%u, scratch=%p, head=%p\n",FUNC,span_lst,span_lst->count,span_lst->scratch,span_lst->head);
@@ -170,7 +170,7 @@ H5S_hyper_print_spans(FILE *f, const struct H5S_hyper_span_info_t *span_lst)
 herr_t
 H5S_space_print_spans(FILE *f, const H5S_t *space)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_space_print_spans)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     H5S_hyper_print_spans(f,space->select.sel_info.hslab->span_lst);
 
@@ -182,7 +182,7 @@ H5S_hyper_print_diminfo_helper(FILE *f, const char *field, unsigned ndims, const
 {
     unsigned u;                 /* Local index variable */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_print_diminfo_helper)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(dinfo!=NULL) {
         HDfprintf(f,"%s: %s: start=[",FUNC,field);
@@ -207,7 +207,7 @@ H5S_hyper_print_diminfo_helper(FILE *f, const char *field, unsigned ndims, const
 herr_t
 H5S_hyper_print_diminfo(FILE *f, const H5S_t *space)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_print_diminfo)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     H5S_hyper_print_diminfo_helper(f,"opt_diminfo",space->extent.rank,space->select.sel_info.hslab->opt_diminfo);
     H5S_hyper_print_diminfo_helper(f,"app_diminfo",space->extent.rank,space->select.sel_info.hslab->app_diminfo);
@@ -243,7 +243,7 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
     unsigned u;                     /* Index variable */
     int i;                          /* Index variable */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_iter_init)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(space));
@@ -428,7 +428,7 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
 static herr_t
 H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_coords)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(iter);
@@ -520,7 +520,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
 {
     unsigned u;                 /* Local index variable */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_block)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(iter);
@@ -568,7 +568,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
 static hsize_t
 H5S_hyper_iter_nelmts (const H5S_sel_iter_t *iter)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_nelmts)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(iter);
@@ -600,7 +600,7 @@ H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *iter)
     unsigned u;                 /* Local index variable */
     htri_t ret_value = FALSE;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_has_next_block)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(iter);
@@ -658,7 +658,7 @@ H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem)
     int fast_dim;       /* Rank of the fastest changing dimension for the dataspace */
     unsigned i;         /* Counters */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_next)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check for the special case of just one H5Sselect_hyperslab call made */
     /* (i.e. a regular hyperslab selection */
@@ -873,7 +873,7 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
     int fast_dim;       /* Rank of the fastest changing dimension for the dataspace */
     unsigned u;         /* Counters */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_next_block)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check for the special case of just one H5Sselect_hyperslab call made */
     /* (i.e. a regular hyperslab selection */
@@ -1055,7 +1055,7 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
 static herr_t
 H5S_hyper_iter_release (H5S_sel_iter_t *iter)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_release)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(iter);
@@ -1095,7 +1095,7 @@ H5S_hyper_new_span(hsize_t low, hsize_t high, H5S_hyper_span_info_t *down, H5S_h
 {
     H5S_hyper_span_t *ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_new_span)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Allocate a new span node */
     if(NULL == (ret_value = H5FL_MALLOC(H5S_hyper_span_t)))
@@ -1143,7 +1143,7 @@ H5S_hyper_span_precompute_helper (H5S_hyper_span_info_t *spans, size_t elmt_size
     H5S_hyper_span_t *span;     /* Hyperslab span */
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_precompute_helper)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(spans);
 
@@ -1201,7 +1201,7 @@ H5S_hyper_span_precompute(H5S_hyper_span_info_t *spans, size_t elmt_size)
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_precompute)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(spans);
 
@@ -1237,7 +1237,7 @@ done:
 static void
 H5S_hyper_span_scratch(H5S_hyper_span_info_t *spans, void *scr_value)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_span_scratch)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(spans);
 
@@ -1290,7 +1290,7 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
     H5S_hyper_span_info_t *new_down;    /* New down span tree */
     H5S_hyper_span_info_t *ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_copy_span_helper)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(spans);
 
@@ -1376,7 +1376,7 @@ H5S_hyper_copy_span(H5S_hyper_span_info_t *spans)
 {
     H5S_hyper_span_info_t *ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_copy_span)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(spans);
 
@@ -1419,7 +1419,7 @@ H5S_hyper_cmp_spans (H5S_hyper_span_info_t *span_info1, H5S_hyper_span_info_t *s
     htri_t nest=FAIL;
     htri_t ret_value=FAIL;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_cmp_spans)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check for redundant comparison */
     if(span_info1==span_info2)
@@ -1520,7 +1520,7 @@ H5S_hyper_free_span_info (H5S_hyper_span_info_t *span_info)
     H5S_hyper_span_t *span, *next_span;
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_free_span_info)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(span_info);
 
@@ -1572,7 +1572,7 @@ H5S_hyper_free_span (H5S_hyper_span_t *span)
 {
     herr_t ret_value=SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_free_span)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(span);
 
@@ -1621,7 +1621,7 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src, hbool_t share_selection)
     const H5S_hyper_sel_t *src_hslab;   /* Pointer to source hyperslab info */
     herr_t ret_value=SUCCEED;   /* return value */
 
-    FUNC_ENTER_NOAPI(H5S_hyper_copy, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(src);
     HDassert(dst);
@@ -1693,7 +1693,7 @@ H5S_hyper_is_valid_helper (const H5S_hyper_span_info_t *spans, const hssize_t *o
     htri_t tmp;                 /* temporary return value */
     htri_t ret_value=TRUE;      /* return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_is_valid_helper)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(spans);
     HDassert(offset);
@@ -1755,7 +1755,7 @@ H5S_hyper_is_valid (const H5S_t *space)
     unsigned u;                    /* Counter */
     htri_t ret_value=TRUE;      /* return value */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_valid)
+    FUNC_ENTER_NOAPI_NOERR
 
     HDassert(space);
 
@@ -1816,7 +1816,7 @@ H5S_hyper_span_nblocks(H5S_hyper_span_info_t *spans)
     H5S_hyper_span_t *span;     /* Hyperslab span */
     hsize_t ret_value = 0;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_span_nblocks)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Count the number of elements in the span tree */
     if(spans != NULL) {
@@ -1860,7 +1860,7 @@ H5S_get_select_hyper_nblocks(H5S_t *space)
 {
     hsize_t ret_value;         /* return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_hyper_nblocks)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
@@ -1902,7 +1902,7 @@ H5Sget_select_hyper_nblocks(hid_t spaceid)
     H5S_t *space;               /* Dataspace to modify selection of */
     hssize_t ret_value;         /* return value */
 
-    FUNC_ENTER_API(H5Sget_select_hyper_nblocks, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE1("Hs", "i", spaceid);
 
     /* Check args */
@@ -1944,7 +1944,7 @@ H5S_hyper_serial_size(const H5S_t *space)
     hsize_t block_count;       /* block counter for regular hyperslabs */
     hssize_t ret_value;         /* return value */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_serial_size)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
@@ -2000,7 +2000,7 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start,
     hsize_t u;                  /* Index variable */
     herr_t ret_value=SUCCEED;  /* return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_serialize_helper)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity checks */
     HDassert(spans);
@@ -2084,7 +2084,7 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf)
     unsigned ndims;         /* Rank of the dataspace */
     int done;               /* Whether we are done with the iteration */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_serialize)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
@@ -2247,7 +2247,7 @@ H5S_hyper_deserialize (H5S_t *space, const uint8_t *buf)
     unsigned i,j;              	/* local counting variables */
     herr_t ret_value=FAIL;  	/* return value */
 
-    FUNC_ENTER_NOAPI(H5S_hyper_deserialize, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(space);
@@ -2330,7 +2330,7 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t
     hsize_t u;                  /* Index variable */
     herr_t ret_value = SUCCEED; /* return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_blocklist)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity checks */
     HDassert(spans);
@@ -2429,7 +2429,7 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_hyper_blocklist)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
     HDassert(buf);
@@ -2587,7 +2587,7 @@ H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock,
     H5S_t *space;               /* Dataspace to modify selection of */
     herr_t ret_value;           /* return value */
 
-    FUNC_ENTER_API(H5Sget_select_hyper_blocklist, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE4("e", "ihh*[a2]h", spaceid, startblock, numblocks, buf);
 
     /* Check args */
@@ -2643,7 +2643,7 @@ H5S_hyper_bounds_helper(const H5S_hyper_span_info_t *spans, const hssize_t *offs
     H5S_hyper_span_t *curr;             /* Hyperslab information nodes */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_bounds_helper)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(spans);
     HDassert(offset);
@@ -2712,7 +2712,7 @@ H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
     unsigned i;                 /* index variable */
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(H5S_hyper_bounds, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(space);
     HDassert(start);
@@ -2782,7 +2782,7 @@ H5S_hyper_offset(const H5S_t *space, hsize_t *offset)
     int i;                      /* index variable */
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(H5S_hyper_offset, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(space);
     HDassert(offset);
@@ -2886,7 +2886,7 @@ H5S_hyper_is_contiguous(const H5S_t *space)
     unsigned u;                     /* index variable */
     htri_t ret_value = FALSE;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_contiguous)
+    FUNC_ENTER_NOAPI_NOERR
 
     HDassert(space);
 
@@ -3071,7 +3071,7 @@ H5S_hyper_is_single(const H5S_t *space)
     unsigned u;                     /* index variable */
     htri_t ret_value=TRUE;         /* return value */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_single)
+    FUNC_ENTER_NOAPI_NOERR
 
     HDassert(space);
 
@@ -3138,7 +3138,7 @@ H5S_hyper_is_regular(const H5S_t *space)
 {
     htri_t ret_value;  /* return value */
 
-    FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_regular)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space);
@@ -3180,7 +3180,7 @@ H5S_hyper_release(H5S_t *space)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5S_hyper_release, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(space));
@@ -3225,7 +3225,7 @@ done:
 static herr_t
 H5S_hyper_recover_span (unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hyper_span_t *next_span)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_recover_span)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(recover);
     HDassert(curr_span);
@@ -3268,7 +3268,7 @@ H5S_hyper_coord_to_span(unsigned rank, hsize_t *coords)
     H5S_hyper_span_info_t *down=NULL;   /* Pointer to new span tree for next level down */
     H5S_hyper_span_t *ret_value=NULL;   /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_coord_to_span)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(rank > 0);
     HDassert(coords);
@@ -3337,7 +3337,7 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
     H5S_hyper_span_t *new_span;         /* New span created for element */
     herr_t ret_value=SUCCEED;           /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_add_span_element_helper)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(span_tree);
     HDassert(rank > 0);
@@ -3535,7 +3535,7 @@ H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hsize_t *coords)
     H5S_hyper_span_info_t *head = NULL;    /* Pointer to new head of span tree */
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_add_span_element)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
     HDassert(rank > 0);
@@ -3611,7 +3611,7 @@ done:
 herr_t
 H5S_hyper_reset_scratch(H5S_t *space)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_reset_scratch)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(space);
 
@@ -3649,7 +3649,7 @@ H5S_hyper_convert(H5S_t *space)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_convert)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
 
@@ -3721,7 +3721,7 @@ H5S_hyper_intersect_helper (H5S_hyper_span_info_t *spans1, H5S_hyper_span_info_t
     htri_t status;              /* Status from recursive call */
     htri_t ret_value=FALSE;     /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect_helper)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert((spans1 && spans2) || (spans1 == NULL && spans2 == NULL));
@@ -3788,7 +3788,7 @@ H5S_hyper_intersect (H5S_t *space1, H5S_t *space2)
 {
     htri_t ret_value=FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert(space1);
@@ -3840,7 +3840,7 @@ H5S_hyper_intersect_block_helper (const H5S_hyper_span_info_t *spans, hsize_t *s
     htri_t status;              /* Status from recursive call */
     htri_t ret_value=FALSE;     /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect_block_helper)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert(spans);
@@ -3907,7 +3907,7 @@ H5S_hyper_intersect_block (H5S_t *space, hsize_t *start, hsize_t *end)
 {
     htri_t ret_value=FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect_block)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Sanity check */
     HDassert(space);
@@ -3956,7 +3956,7 @@ H5S_hyper_adjust_helper_u (H5S_hyper_span_info_t *spans, const hsize_t *offset)
 {
     H5S_hyper_span_t *span;     /* Pointer to current span in span tree */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_adjust_helper_u)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Sanity check */
     HDassert(spans);
@@ -4014,7 +4014,7 @@ H5S_hyper_adjust_u(H5S_t *space, const hsize_t *offset)
     unsigned u;                         /* Local index variable */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_adjust_u)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
     HDassert(offset);
@@ -4060,7 +4060,7 @@ H5S_hyper_project_scalar(const H5S_t *space, hsize_t *offset)
     hsize_t block[H5S_MAX_RANK];     /* Block selected in base dataspace */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_project_scalar)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(space));
@@ -4128,7 +4128,7 @@ H5S_hyper_project_simple_lower(const H5S_t *base_space, H5S_t *new_space)
     H5S_hyper_span_info_t *down;        /* Pointer to list of spans */
     unsigned curr_dim;                  /* Current dimension being operated on */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_project_simple_lower)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(base_space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(base_space));
@@ -4176,7 +4176,7 @@ H5S_hyper_project_simple_higher(const H5S_t *base_space, H5S_t *new_space)
     unsigned curr_dim;                  /* Current dimension being operated on */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_project_simple_higher)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(base_space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(base_space));
@@ -4264,7 +4264,7 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_project_simple)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(base_space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(base_space));
@@ -4432,7 +4432,7 @@ H5S_hyper_adjust_helper_s(H5S_hyper_span_info_t *spans, const hssize_t *offset)
 {
     H5S_hyper_span_t *span;     /* Pointer to current span in span tree */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_adjust_helper_s)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Sanity check */
     HDassert(spans);
@@ -4490,7 +4490,7 @@ H5S_hyper_adjust_s(H5S_t *space, const hssize_t *offset)
     unsigned u;                         /* Local index variable */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_adjust_s)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
     HDassert(offset);
@@ -4544,7 +4544,7 @@ H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset)
     unsigned u;                         /* Local index variable */
     herr_t ret_value = FALSE;           /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_normalize_offset)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
 
@@ -4598,7 +4598,7 @@ H5S_hyper_denormalize_offset(H5S_t *space, const hssize_t *old_offset)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_denormalize_offset)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
     HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
@@ -4643,7 +4643,7 @@ H5S_hyper_append_span (H5S_hyper_span_t **prev_span, H5S_hyper_span_info_t ** sp
     H5S_hyper_span_t *new_span = NULL;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_append_span)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(prev_span);
     HDassert(span_tree);
@@ -4767,7 +4767,7 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
     unsigned recover_a, recover_b;         /* Flags to indicate when to recover temporary spans */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_clip_spans)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(a_spans);
@@ -5257,7 +5257,7 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
     unsigned recover_a, recover_b;         /* Flags to indicate when to recover temporary spans */
     H5S_hyper_span_info_t *ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_merge_spans_helper)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Make certain both 'a' & 'b' spans have down span trees or neither does */
     HDassert((a_spans != NULL && b_spans != NULL) || (a_spans == NULL && b_spans == NULL));
@@ -5569,7 +5569,7 @@ done:
 static herr_t
 H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans, hbool_t can_own)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_merge_spans)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space);
@@ -5625,7 +5625,7 @@ H5S_hyper_spans_nelem (H5S_hyper_span_info_t *spans)
     H5S_hyper_span_t *span;     /* Hyperslab span */
     hsize_t ret_value;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_spans_nelem)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Count the number of elements in the span tree */
     if(spans==NULL)
@@ -5687,7 +5687,7 @@ H5S_hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride,
     unsigned               u;               /* Counters */
     H5S_hyper_span_info_t *ret_value;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_make_spans)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(rank > 0);
@@ -5828,7 +5828,7 @@ H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span, H5S_hyper_dim_t span_slab
     H5S_hyper_dim_t      canon_down_span_slab_info[H5S_MAX_RANK];
     hbool_t ret_value = TRUE;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_rebuild_helper)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(span) {
         /* Initialization */
@@ -5956,7 +5956,7 @@ H5S_hyper_rebuild(H5S_t *space)
     unsigned rank, curr_dim;
     htri_t ret_value = TRUE;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_rebuild)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space);
@@ -6018,7 +6018,7 @@ H5S_hyper_generate_spans(H5S_t *space)
     unsigned u;                             /* Counter */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_generate_spans)
+    FUNC_ENTER_NOAPI_NOINIT
 
     HDassert(space);
     HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
@@ -6068,7 +6068,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
     H5S_hyper_span_info_t *b_not_a=NULL;    /* Span tree for hyperslab spans in new span tree and not in old span tree */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_generate_hyperslab)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(space);
@@ -6314,7 +6314,7 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
     unsigned u;                     /* Counters */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5S_select_hyperslab, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(space);
@@ -6585,7 +6585,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
     unsigned u;                 /* Local index variable */
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_API(H5Sselect_hyperslab, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
 
     /* Check args */
@@ -6639,7 +6639,7 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
     H5S_hyper_span_info_t *b_not_a=NULL;    /* Span tree for hyperslab spans in new span tree and not in old span tree */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_operate_hyperslab)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(result);
@@ -6846,7 +6846,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
     hbool_t span2_owned=FALSE;          /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_generate_hyperslab)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(space);
@@ -6923,7 +6923,7 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
     unsigned u;                    /* Counters */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5S_select_hyperslab, FAIL)
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(space);
@@ -7180,7 +7180,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
     H5S_t	*space = NULL;  /* Dataspace to modify selection of */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API(H5Sselect_hyperslab, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
 
     /* Check args */
@@ -7249,7 +7249,7 @@ H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
     H5S_t	*new_space = NULL;  /* New dataspace created */
     hid_t	ret_value;
 
-    FUNC_ENTER_API(H5Scombine_hyperslab, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE6("i", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
 
     /* Check args */
@@ -7302,7 +7302,7 @@ H5S_combine_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
     hbool_t span2_owned=FALSE;          /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
     H5S_t *ret_value;         /* return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_combine_select)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(space1);
@@ -7374,7 +7374,7 @@ H5Scombine_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id)
     H5S_t	*new_space = NULL;      /* New Dataspace */
     hid_t	ret_value;
 
-    FUNC_ENTER_API(H5Scombine_select, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "iSsi", space1_id, op, space2_id);
 
     /* Check args */
@@ -7430,7 +7430,7 @@ H5S_select_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
     hbool_t span2_owned=FALSE;          /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5S_select_select)
+    FUNC_ENTER_NOAPI_NOINIT
 
     /* Check args */
     HDassert(space1);
@@ -7499,7 +7499,7 @@ H5Sselect_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id)
     H5S_t	*space2;                /* Second Dataspace */
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API(H5Sselect_select, FAIL)
+    FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "iSsi", space1_id, op, space2_id);
 
     /* Check args */
@@ -7583,7 +7583,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
     unsigned u;        /* Index variable */
     int i;             /* Index variable */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_gen)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space);
@@ -8017,7 +8017,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
     unsigned u;         /* Local index variable */
     int i;              /* Local index variable */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_opt)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space);
@@ -8447,7 +8447,7 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
     unsigned u;                 /* Local index variable */
     int i;                      /* Local index variable */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_single)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space);
@@ -8715,7 +8715,7 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned UNUSED flags, H5S_sel_iter_t
 {
     herr_t ret_value;      /* return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list)
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Check args */
     HDassert(space);