Removes alternative function enter/leave macro scheme (#678)

* Committing clang-format changes

* Converted BEGIN_FUNC, etc. macros to FUNC_ENTER

* Rips out the BEGIN_FUNC, etc. macros

* Removes 'end if', etc. comments from H5HL package

* Committing clang-format changes

* Fixes an H5EA iterate issue

* Fixes an issue in the H5FA iterator code

* Further cleanup in bin/trace after macro removal

* Iterator changes in H5EA and H5FA

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

1 files changed, 195 insertions, 122 deletions

diff --git a/src/H5EAhdr.c b/src/H5EAhdr.c
index 7f142af..2c68949 100644
--- a/src/H5EAhdr.c
+++ b/src/H5EAhdr.c
@@ -102,17 +102,21 @@ H5FL_SEQ_DEFINE_STATIC(H5EA_sblk_info_t);
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, H5EA_hdr_t *, NULL, NULL, H5EA__hdr_alloc(H5F_t *f))
+H5EA_hdr_t *
+H5EA__hdr_alloc(H5F_t *f)
+{
+    H5EA_hdr_t *hdr       = NULL; /* Shared extensible array header */
+    H5EA_hdr_t *ret_value = NULL;
 
-    /* Local variables */
-    H5EA_hdr_t *hdr = NULL; /* Shared extensible array header */
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(f);
 
     /* Allocate space for the shared information */
     if (NULL == (hdr = H5FL_CALLOC(H5EA_hdr_t)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array shared header")
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, NULL,
+                    "memory allocation failed for extensible array shared header")
 
     /* Set non-zero internal fields */
     hdr->addr = HADDR_UNDEF;
@@ -126,12 +130,13 @@ BEGIN_FUNC(PKG, ERR, H5EA_hdr_t *, NULL, NULL, H5EA__hdr_alloc(H5F_t *f))
     /* Set the return value */
     ret_value = hdr;
 
-    CATCH
+done:
     if (!ret_value)
         if (hdr && H5EA__hdr_dest(hdr) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array header")
+            HDONE_ERROR(H5E_EARRAY, H5E_CANTFREE, NULL, "unable to destroy extensible array header")
 
-END_FUNC(PKG) /* end H5EA__hdr_alloc() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_alloc() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_init
@@ -168,12 +173,15 @@ END_FUNC(PKG) /* end H5EA__hdr_alloc() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_init(H5EA_hdr_t *hdr, void *ctx_udata))
-
-    /* Local variables */
+herr_t
+H5EA__hdr_init(H5EA_hdr_t *hdr, void *ctx_udata)
+{
     hsize_t start_idx;  /* First element index for each super block */
     hsize_t start_dblk; /* First data block index for each super block */
     size_t  u;          /* Local index variable */
+    herr_t  ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
@@ -188,7 +196,7 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_init(H5EA_hdr_t *hdr, void
 
     /* Allocate information for each super block */
     if (NULL == (hdr->sblk_info = H5FL_SEQ_MALLOC(H5EA_sblk_info_t, hdr->nsblks)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for super block info array")
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, FAIL, "memory allocation failed for super block info array")
 
     /* Compute information about each super block */
     start_idx  = 0;
@@ -202,7 +210,7 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_init(H5EA_hdr_t *hdr, void
         /* Advance starting indices for next super block */
         start_idx += (hsize_t)hdr->sblk_info[u].ndblks * (hsize_t)hdr->sblk_info[u].dblk_nelmts;
         start_dblk += (hsize_t)hdr->sblk_info[u].ndblks;
-    } /* end for */
+    }
 
     /* Set size of header on disk (locally and in statistics) */
     hdr->stats.computed.hdr_size = hdr->size = H5EA_HEADER_SIZE_HDR(hdr);
@@ -210,12 +218,13 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_init(H5EA_hdr_t *hdr, void
     /* Create the callback context, if there's one */
     if (hdr->cparam.cls->crt_context) {
         if (NULL == (hdr->cb_ctx = (*hdr->cparam.cls->crt_context)(ctx_udata)))
-            H5E_THROW(H5E_CANTCREATE, "unable to create extensible array client callback context")
-    } /* end if */
-
-    CATCH
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTCREATE, FAIL,
+                        "unable to create extensible array client callback context")
+    }
 
-END_FUNC(PKG) /* end H5EA__hdr_init() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_init() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_alloc_elmts
@@ -229,11 +238,14 @@ END_FUNC(PKG) /* end H5EA__hdr_init() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, void *, NULL, NULL, H5EA__hdr_alloc_elmts(H5EA_hdr_t *hdr, size_t nelmts))
-
-    /* Local variables */
+void *
+H5EA__hdr_alloc_elmts(H5EA_hdr_t *hdr, size_t nelmts)
+{
     void *   elmts = NULL; /* Element buffer allocated */
     unsigned idx;          /* Index of element buffer factory in header */
+    void *   ret_value = NULL;
+
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(hdr);
@@ -251,8 +263,8 @@ BEGIN_FUNC(PKG, ERR, void *, NULL, NULL, H5EA__hdr_alloc_elmts(H5EA_hdr_t *hdr,
 
         /* Re-allocate array of element factories */
         if (NULL == (new_fac = H5FL_SEQ_REALLOC(H5FL_fac_head_ptr_t, hdr->elmt_fac.fac, new_nalloc)))
-            H5E_THROW(H5E_CANTALLOC,
-                      "memory allocation failed for data block data element buffer factory array")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, NULL,
+                        "memory allocation failed for data block data element buffer factory array")
 
         /* Zero out new elements allocated */
         HDmemset(new_fac + hdr->elmt_fac.nalloc, 0,
@@ -266,22 +278,24 @@ BEGIN_FUNC(PKG, ERR, void *, NULL, NULL, H5EA__hdr_alloc_elmts(H5EA_hdr_t *hdr,
     /* Check for un-initialized factory at index */
     if (NULL == hdr->elmt_fac.fac[idx]) {
         if (NULL == (hdr->elmt_fac.fac[idx] = H5FL_fac_init(nelmts * (size_t)hdr->cparam.cls->nat_elmt_size)))
-            H5E_THROW(H5E_CANTINIT, "can't create data block data element buffer factory")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTINIT, NULL, "can't create data block data element buffer factory")
     } /* end if */
 
     /* Allocate buffer for elements in index block */
     if (NULL == (elmts = H5FL_FAC_MALLOC(hdr->elmt_fac.fac[idx])))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for data block data element buffer")
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, NULL,
+                    "memory allocation failed for data block data element buffer")
 
     /* Set the return value */
     ret_value = elmts;
 
-    CATCH
+done:
     if (!ret_value)
         if (elmts)
             elmts = H5FL_FAC_FREE(hdr->elmt_fac.fac[idx], elmts);
 
-END_FUNC(PKG) /* end H5EA__hdr_alloc_elmts() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_alloc_elmts() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_free_elmts
@@ -295,11 +309,13 @@ END_FUNC(PKG) /* end H5EA__hdr_alloc_elmts() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, NOERR, herr_t, SUCCEED, -, H5EA__hdr_free_elmts(H5EA_hdr_t *hdr, size_t nelmts, void *elmts))
-
-    /* Local variables */
+herr_t
+H5EA__hdr_free_elmts(H5EA_hdr_t *hdr, size_t nelmts, void *elmts)
+{
     unsigned idx; /* Index of element buffer factory in header */
 
+    FUNC_ENTER_PACKAGE_NOERR
+
     /* Check arguments */
     HDassert(hdr);
     HDassert(nelmts > 0);
@@ -314,26 +330,30 @@ BEGIN_FUNC(PKG, NOERR, herr_t, SUCCEED, -, H5EA__hdr_free_elmts(H5EA_hdr_t *hdr,
     HDassert(hdr->elmt_fac.fac[idx]);
     elmts = H5FL_FAC_FREE(hdr->elmt_fac.fac[idx], elmts);
 
-END_FUNC(PKG) /* end H5EA__hdr_free_elmts() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5EA__hdr_free_elmts() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_create
  *
  * Purpose:	Creates a new extensible array header in the file
  *
- * Return:	SUCCEED/FAIL
+ * Return:      Success:    Address of new header in the file
+ *              Failure:    HADDR_UNDEF
  *
  * Programmer:	Quincey Koziol
  *		Jun 17 2008
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, haddr_t, HADDR_UNDEF, HADDR_UNDEF,
-           H5EA__hdr_create(H5F_t *f, const H5EA_create_t *cparam, void *ctx_udata))
+haddr_t
+H5EA__hdr_create(H5F_t *f, const H5EA_create_t *cparam, void *ctx_udata)
+{
+    H5EA_hdr_t *hdr       = NULL;  /* Extensible array header */
+    hbool_t     inserted  = FALSE; /* Whether the header was inserted into cache */
+    haddr_t     ret_value = HADDR_UNDEF;
 
-    /* Local variables */
-    H5EA_hdr_t *hdr      = NULL;  /* Extensible array header */
-    hbool_t     inserted = FALSE; /* Whether the header was inserted into cache */
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(f);
@@ -347,39 +367,45 @@ BEGIN_FUNC(PKG, ERR, haddr_t, HADDR_UNDEF, HADDR_UNDEF,
 
         /* Check for valid parameters */
         if (cparam->raw_elmt_size == 0)
-            H5E_THROW(H5E_BADVALUE, "element size must be greater than zero")
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF, "element size must be greater than zero")
         if (cparam->max_nelmts_bits == 0)
-            H5E_THROW(H5E_BADVALUE, "max. # of elements bits must be greater than zero")
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF,
+                        "max. # of elements bits must be greater than zero")
         if (cparam->max_nelmts_bits > H5EA_MAX_NELMTS_IDX_MAX)
-            H5E_THROW(H5E_BADVALUE, "max. # of elements bits must be <= %u",
-                      (unsigned)H5EA_MAX_NELMTS_IDX_MAX)
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF, "max. # of elements bits must be <= %u",
+                        (unsigned)H5EA_MAX_NELMTS_IDX_MAX)
         if (cparam->sup_blk_min_data_ptrs < 2)
-            H5E_THROW(H5E_BADVALUE, "min # of data block pointers in super block must be >= two")
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF,
+                        "min # of data block pointers in super block must be >= two")
         if (!POWER_OF_TWO(cparam->sup_blk_min_data_ptrs))
-            H5E_THROW(H5E_BADVALUE, "min # of data block pointers in super block must be power of two")
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF,
+                        "min # of data block pointers in super block must be power of two")
         if (!POWER_OF_TWO(cparam->data_blk_min_elmts))
-            H5E_THROW(H5E_BADVALUE, "min # of elements per data block must be power of two")
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF,
+                        "min # of elements per data block must be power of two")
         dblk_page_nelmts = (size_t)1 << cparam->max_dblk_page_nelmts_bits;
         if (dblk_page_nelmts < cparam->idx_blk_elmts)
-            H5E_THROW(H5E_BADVALUE,
-                      "# of elements per data block page must be greater than # of elements in index block")
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF,
+                        "# of elements per data block page must be greater than # of elements in index block")
 
         /* Compute the number of elements in data blocks for first actual super block */
         sblk_idx    = H5EA_SBLK_FIRST_IDX(cparam->sup_blk_min_data_ptrs);
         dblk_nelmts = H5EA_SBLK_DBLK_NELMTS(sblk_idx, cparam->data_blk_min_elmts);
         if (dblk_page_nelmts < dblk_nelmts)
-            H5E_THROW(H5E_BADVALUE, "max. # of elements per data block page bits must be > # of elements in "
-                                    "first data block from super block")
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF,
+                        "max. # of elements per data block page bits must be > # of elements in "
+                        "first data block from super block")
 
         if (cparam->max_dblk_page_nelmts_bits > cparam->max_nelmts_bits)
-            H5E_THROW(H5E_BADVALUE,
-                      "max. # of elements per data block page bits must be <= max. # of elements bits")
+            HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, HADDR_UNDEF,
+                        "max. # of elements per data block page bits must be <= max. # of elements bits")
     }
 #endif /* NDEBUG */
 
     /* Allocate space for the shared information */
     if (NULL == (hdr = H5EA__hdr_alloc(f)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for extensible array shared header")
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, HADDR_UNDEF,
+                    "memory allocation failed for extensible array shared header")
 
     /* Set the internal parameters for the array */
     hdr->idx_blk_addr = HADDR_UNDEF;
@@ -389,49 +415,55 @@ BEGIN_FUNC(PKG, ERR, haddr_t, HADDR_UNDEF, HADDR_UNDEF,
 
     /* Finish initializing extensible array header */
     if (H5EA__hdr_init(hdr, ctx_udata) < 0)
-        H5E_THROW(H5E_CANTINIT, "initialization failed for extensible array header")
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTINIT, HADDR_UNDEF,
+                    "initialization failed for extensible array header")
 
     /* Allocate space for the header on disk */
     if (HADDR_UNDEF == (hdr->addr = H5MF_alloc(f, H5FD_MEM_EARRAY_HDR, (hsize_t)hdr->size)))
-        H5E_THROW(H5E_CANTALLOC, "file allocation failed for extensible array header")
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTALLOC, HADDR_UNDEF,
+                    "file allocation failed for extensible array header")
 
     /* Create 'top' proxy for extensible array entries */
     if (hdr->swmr_write)
         if (NULL == (hdr->top_proxy = H5AC_proxy_entry_create()))
-            H5E_THROW(H5E_CANTCREATE, "can't create extensible array entry proxy")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTCREATE, HADDR_UNDEF, "can't create extensible array entry proxy")
 
     /* Cache the new extensible array header */
     if (H5AC_insert_entry(f, H5AC_EARRAY_HDR, hdr->addr, hdr, H5AC__NO_FLAGS_SET) < 0)
-        H5E_THROW(H5E_CANTINSERT, "can't add extensible array header to cache")
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTINSERT, HADDR_UNDEF, "can't add extensible array header to cache")
     inserted = TRUE;
 
     /* Add header as child of 'top' proxy */
     if (hdr->top_proxy)
         if (H5AC_proxy_entry_add_child(hdr->top_proxy, f, hdr) < 0)
-            H5E_THROW(H5E_CANTSET, "unable to add extensible array entry as child of array proxy")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTSET, HADDR_UNDEF,
+                        "unable to add extensible array entry as child of array proxy")
 
     /* Set address of array header to return */
     ret_value = hdr->addr;
 
-    CATCH
+done:
     if (!H5F_addr_defined(ret_value))
         if (hdr) {
             /* Remove from cache, if inserted */
             if (inserted)
                 if (H5AC_remove_entry(hdr) < 0)
-                    H5E_THROW(H5E_CANTREMOVE, "unable to remove extensible array header from cache")
+                    HDONE_ERROR(H5E_EARRAY, H5E_CANTREMOVE, HADDR_UNDEF,
+                                "unable to remove extensible array header from cache")
 
             /* Release header's disk space */
             if (H5F_addr_defined(hdr->addr) &&
                 H5MF_xfree(f, H5FD_MEM_EARRAY_HDR, hdr->addr, (hsize_t)hdr->size) < 0)
-                H5E_THROW(H5E_CANTFREE, "unable to free extensible array header")
+                HDONE_ERROR(H5E_EARRAY, H5E_CANTFREE, HADDR_UNDEF, "unable to free extensible array header")
 
             /* Destroy header */
             if (H5EA__hdr_dest(hdr) < 0)
-                H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array header")
+                HDONE_ERROR(H5E_EARRAY, H5E_CANTFREE, HADDR_UNDEF,
+                            "unable to destroy extensible array header")
         } /* end if */
 
-END_FUNC(PKG) /* end H5EA__hdr_create() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_create() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_incr
@@ -445,7 +477,12 @@ END_FUNC(PKG) /* end H5EA__hdr_create() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_incr(H5EA_hdr_t *hdr))
+herr_t
+H5EA__hdr_incr(H5EA_hdr_t *hdr)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
@@ -453,14 +490,14 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_incr(H5EA_hdr_t *hdr))
     /* Mark header as un-evictable when something is depending on it */
     if (hdr->rc == 0)
         if (H5AC_pin_protected_entry(hdr) < 0)
-            H5E_THROW(H5E_CANTPIN, "unable to pin extensible array header")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTPIN, FAIL, "unable to pin extensible array header")
 
     /* Increment reference count on shared header */
     hdr->rc++;
 
-    CATCH
-
-END_FUNC(PKG) /* end H5EA__hdr_incr() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_incr() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_decr
@@ -474,7 +511,12 @@ END_FUNC(PKG) /* end H5EA__hdr_incr() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_decr(H5EA_hdr_t *hdr))
+herr_t
+H5EA__hdr_decr(H5EA_hdr_t *hdr)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
@@ -487,12 +529,12 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_decr(H5EA_hdr_t *hdr))
     if (hdr->rc == 0) {
         HDassert(hdr->file_rc == 0);
         if (H5AC_unpin_entry(hdr) < 0)
-            H5E_THROW(H5E_CANTUNPIN, "unable to unpin extensible array header")
-    } /* end if */
-
-    CATCH
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTUNPIN, FAIL, "unable to unpin extensible array header")
+    }
 
-END_FUNC(PKG) /* end H5EA__hdr_decr() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_decr() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_fuse_incr
@@ -506,7 +548,10 @@ END_FUNC(PKG) /* end H5EA__hdr_decr() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, NOERR, herr_t, SUCCEED, -, H5EA__hdr_fuse_incr(H5EA_hdr_t *hdr))
+herr_t
+H5EA__hdr_fuse_incr(H5EA_hdr_t *hdr)
+{
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Sanity check */
     HDassert(hdr);
@@ -514,21 +559,28 @@ BEGIN_FUNC(PKG, NOERR, herr_t, SUCCEED, -, H5EA__hdr_fuse_incr(H5EA_hdr_t *hdr))
     /* Increment file reference count on shared header */
     hdr->file_rc++;
 
-END_FUNC(PKG) /* end H5EA__hdr_fuse_incr() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5EA__hdr_fuse_incr() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_fuse_decr
  *
  * Purpose:	Decrement file reference count on shared array header
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Success:    The reference count of the header
+ *              Failure:    Can't fail
  *
  * Programmer:	Quincey Koziol
  *		Aug 26 2008
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, NOERR, size_t, 0, -, H5EA__hdr_fuse_decr(H5EA_hdr_t *hdr))
+size_t
+H5EA__hdr_fuse_decr(H5EA_hdr_t *hdr)
+{
+    size_t ret_value = 0;
+
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Sanity check */
     HDassert(hdr);
@@ -540,7 +592,8 @@ BEGIN_FUNC(PKG, NOERR, size_t, 0, -, H5EA__hdr_fuse_decr(H5EA_hdr_t *hdr))
     /* Set return value */
     ret_value = hdr->file_rc;
 
-END_FUNC(PKG) /* end H5EA__hdr_fuse_decr() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_fuse_decr() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_modified
@@ -554,7 +607,12 @@ END_FUNC(PKG) /* end H5EA__hdr_fuse_decr() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_modified(H5EA_hdr_t *hdr))
+herr_t
+H5EA__hdr_modified(H5EA_hdr_t *hdr)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
@@ -562,11 +620,11 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_modified(H5EA_hdr_t *hdr))
 
     /* Mark header as dirty in cache */
     if (H5AC_mark_entry_dirty(hdr) < 0)
-        H5E_THROW(H5E_CANTMARKDIRTY, "unable to mark extensible array header as dirty")
-
-    CATCH
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTMARKDIRTY, FAIL, "unable to mark extensible array header as dirty")
 
-END_FUNC(PKG) /* end H5EA__hdr_modified() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_modified() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_protect
@@ -580,12 +638,14 @@ END_FUNC(PKG) /* end H5EA__hdr_modified() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, H5EA_hdr_t *, NULL, NULL,
-           H5EA__hdr_protect(H5F_t *f, haddr_t ea_addr, void *ctx_udata, unsigned flags))
-
-    /* Local variables */
+H5EA_hdr_t *
+H5EA__hdr_protect(H5F_t *f, haddr_t ea_addr, void *ctx_udata, unsigned flags)
+{
     H5EA_hdr_t *        hdr;   /* Extensible array header */
     H5EA_hdr_cache_ud_t udata; /* User data for cache callbacks */
+    H5EA_hdr_t *        ret_value = NULL;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(f);
@@ -601,27 +661,28 @@ BEGIN_FUNC(PKG, ERR, H5EA_hdr_t *, NULL, NULL,
 
     /* Protect the header */
     if (NULL == (hdr = (H5EA_hdr_t *)H5AC_protect(f, H5AC_EARRAY_HDR, ea_addr, &udata, flags)))
-        H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array header, address = %llu",
-                  (unsigned long long)ea_addr)
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTPROTECT, NULL,
+                    "unable to protect extensible array header, address = %llu", (unsigned long long)ea_addr)
     hdr->f = f; /* (Must be set again here, in case the header was already in the cache -QAK) */
 
     /* Create top proxy, if it doesn't exist */
     if (hdr->swmr_write && NULL == hdr->top_proxy) {
         /* Create 'top' proxy for extensible array entries */
         if (NULL == (hdr->top_proxy = H5AC_proxy_entry_create()))
-            H5E_THROW(H5E_CANTCREATE, "can't create extensible array entry proxy")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTCREATE, NULL, "can't create extensible array entry proxy")
 
         /* Add header as child of 'top' proxy */
         if (H5AC_proxy_entry_add_child(hdr->top_proxy, f, hdr) < 0)
-            H5E_THROW(H5E_CANTSET, "unable to add extensible array entry as child of array proxy")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTSET, NULL,
+                        "unable to add extensible array entry as child of array proxy")
     } /* end if */
 
     /* Set return value */
     ret_value = hdr;
 
-    CATCH
-
-END_FUNC(PKG) /* end H5EA__hdr_protect() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_protect() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_unprotect
@@ -635,21 +696,24 @@ END_FUNC(PKG) /* end H5EA__hdr_protect() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_unprotect(H5EA_hdr_t *hdr, unsigned cache_flags))
+herr_t
+H5EA__hdr_unprotect(H5EA_hdr_t *hdr, unsigned cache_flags)
+{
+    herr_t ret_value = SUCCEED;
 
-    /* Local variables */
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
 
     /* Unprotect the header */
     if (H5AC_unprotect(hdr->f, H5AC_EARRAY_HDR, hdr->addr, hdr, cache_flags) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect extensible array hdr, address = %llu",
-                  (unsigned long long)hdr->addr)
-
-    CATCH
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTUNPROTECT, FAIL,
+                    "unable to unprotect extensible array hdr, address = %llu", (unsigned long long)hdr->addr)
 
-END_FUNC(PKG) /* end H5EA__hdr_unprotect() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_unprotect() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_delete
@@ -663,46 +727,48 @@ END_FUNC(PKG) /* end H5EA__hdr_unprotect() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_delete(H5EA_hdr_t *hdr))
-
-    /* Local variables */
+herr_t
+H5EA__hdr_delete(H5EA_hdr_t *hdr)
+{
     unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting header */
+    herr_t   ret_value   = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
     HDassert(!hdr->file_rc);
 
 #ifndef NDEBUG
-    {
-        unsigned hdr_status = 0; /* Array header's status in the metadata cache */
+    unsigned hdr_status = 0; /* Array header's status in the metadata cache */
 
-        /* Check the array header's status in the metadata cache */
-        if (H5AC_get_entry_status(hdr->f, hdr->addr, &hdr_status) < 0)
-            H5E_THROW(H5E_CANTGET, "unable to check metadata cache status for array header")
+    /* Check the array header's status in the metadata cache */
+    if (H5AC_get_entry_status(hdr->f, hdr->addr, &hdr_status) < 0)
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTGET, FAIL, "unable to check metadata cache status for array header")
 
-        /* Sanity checks on array header */
-        HDassert(hdr_status & H5AC_ES__IN_CACHE);
-        HDassert(hdr_status & H5AC_ES__IS_PROTECTED);
-    }  /* end block */
+    /* Sanity checks on array header */
+    HDassert(hdr_status & H5AC_ES__IN_CACHE);
+    HDassert(hdr_status & H5AC_ES__IS_PROTECTED);
 #endif /* NDEBUG */
 
     /* Check for index block */
     if (H5F_addr_defined(hdr->idx_blk_addr)) {
         /* Delete index block */
         if (H5EA__iblock_delete(hdr) < 0)
-            H5E_THROW(H5E_CANTDELETE, "unable to delete extensible array index block")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTDELETE, FAIL, "unable to delete extensible array index block")
     } /* end if */
 
     /* Set flags to finish deleting header on unprotect */
     cache_flags |= H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
 
-    CATCH
+done:
 
     /* Unprotect the header, deleting it if an error hasn't occurred */
     if (H5EA__hdr_unprotect(hdr, cache_flags) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release extensible array header")
+        HGOTO_ERROR(H5E_EARRAY, H5E_CANTUNPROTECT, FAIL, "unable to release extensible array header")
 
-END_FUNC(PKG) /* end H5EA__hdr_delete() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_delete() */
 
 /*-------------------------------------------------------------------------
  * Function:	H5EA__hdr_dest
@@ -716,7 +782,12 @@ END_FUNC(PKG) /* end H5EA__hdr_delete() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_dest(H5EA_hdr_t *hdr))
+herr_t
+H5EA__hdr_dest(H5EA_hdr_t *hdr)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(hdr);
@@ -725,7 +796,8 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_dest(H5EA_hdr_t *hdr))
     /* Destroy the callback context */
     if (hdr->cb_ctx) {
         if ((*hdr->cparam.cls->dst_context)(hdr->cb_ctx) < 0)
-            H5E_THROW(H5E_CANTRELEASE, "unable to destroy extensible array client callback context")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTRELEASE, FAIL,
+                        "unable to destroy extensible array client callback context")
     } /* end if */
     hdr->cb_ctx = NULL;
 
@@ -741,7 +813,8 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_dest(H5EA_hdr_t *hdr))
             /* Check if this factory has been initialized */
             if (hdr->elmt_fac.fac[u]) {
                 if (H5FL_fac_term(hdr->elmt_fac.fac[u]) < 0)
-                    H5E_THROW(H5E_CANTRELEASE, "unable to destroy extensible array header factory")
+                    HGOTO_ERROR(H5E_EARRAY, H5E_CANTRELEASE, FAIL,
+                                "unable to destroy extensible array header factory")
                 hdr->elmt_fac.fac[u] = NULL;
             } /* end if */
         }     /* end for */
@@ -757,13 +830,13 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5EA__hdr_dest(H5EA_hdr_t *hdr))
     /* Destroy the 'top' proxy */
     if (hdr->top_proxy) {
         if (H5AC_proxy_entry_dest(hdr->top_proxy) < 0)
-            H5E_THROW(H5E_CANTRELEASE, "unable to destroy extensible array 'top' proxy")
+            HGOTO_ERROR(H5E_EARRAY, H5E_CANTRELEASE, FAIL, "unable to destroy extensible array 'top' proxy")
         hdr->top_proxy = NULL;
     } /* end if */
 
     /* Free the shared info itself */
     hdr = H5FL_FREE(H5EA_hdr_t, hdr);
 
-    CATCH
-
-END_FUNC(PKG) /* end H5EA__hdr_dest() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5EA__hdr_dest() */