Merge hdf5 1 10 8 (#1154)hdf5-1_10_8

 Merge HDF5 1.10.8 release files to 1.10/master

1 files changed, 209 insertions, 197 deletions

diff --git a/src/H5FAhdr.c b/src/H5FAhdr.c
index b25d50b..aeb3fb1 100644
--- a/src/H5FAhdr.c
+++ b/src/H5FAhdr.c
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -24,54 +24,45 @@
 /* Module Declaration */
 /**********************/
 
-#include "H5FAmodule.h"         /* This source code file is part of the H5FA module */
-
+#include "H5FAmodule.h" /* This source code file is part of the H5FA module */
 
 /***********************/
 /* Other Packages Used */
 /***********************/
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions                            */
-#include "H5Eprivate.h"     /* Error handling                               */
-#include "H5FApkg.h"        /* Fixed Arrays                                 */
-#include "H5MFprivate.h"    /* File memory management                       */
-#include "H5MMprivate.h"    /* Memory management                            */
-
+#include "H5private.h"   /* Generic Functions                            */
+#include "H5Eprivate.h"  /* Error handling                               */
+#include "H5FApkg.h"     /* Fixed Arrays                                 */
+#include "H5MFprivate.h" /* File memory management                       */
+#include "H5MMprivate.h" /* Memory management                            */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -79,7 +70,6 @@
 /* Declare a free list to manage the H5FA_hdr_t struct */
 H5FL_DEFINE_STATIC(H5FA_hdr_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_alloc
  *
@@ -92,41 +82,40 @@ H5FL_DEFINE_STATIC(H5FA_hdr_t);
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-H5FA_hdr_t *, NULL, NULL,
-H5FA__hdr_alloc(H5F_t *f))
+H5FA_hdr_t *
+H5FA__hdr_alloc(H5F_t *f)
+{
+    H5FA_hdr_t *hdr       = NULL; /* Shared Fixed Array header */
+    H5FA_hdr_t *ret_value = NULL;
 
-    /* Local variables */
-    H5FA_hdr_t *hdr = NULL;          /* Shared Fixed Array header */
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(f);
 
     /* Allocate space for the shared information */
-    if(NULL == (hdr = H5FL_CALLOC(H5FA_hdr_t)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for Fixed Array shared header")
+    if (NULL == (hdr = H5FL_CALLOC(H5FA_hdr_t)))
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, NULL, "memory allocation failed for Fixed Array shared header")
 
     /* Set non-zero internal fields */
     hdr->addr = HADDR_UNDEF;
 
     /* Set the internal parameters for the array */
-    hdr->f = f;
-    hdr->swmr_write = (H5F_INTENT(f) & H5F_ACC_SWMR_WRITE) > 0;
+    hdr->f           = f;
+    hdr->swmr_write  = (H5F_INTENT(f) & H5F_ACC_SWMR_WRITE) > 0;
     hdr->sizeof_addr = H5F_SIZEOF_ADDR(f);
     hdr->sizeof_size = H5F_SIZEOF_SIZE(f);
 
     /* Set the return value */
     ret_value = hdr;
 
-CATCH
-
-    if(!ret_value)
-        if(hdr && H5FA__hdr_dest(hdr) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header")
+done:
+    if (!ret_value)
+        if (hdr && H5FA__hdr_dest(hdr) < 0)
+            HDONE_ERROR(H5E_FARRAY, H5E_CANTFREE, NULL, "unable to destroy fixed array header")
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_alloc() */
 
-END_FUNC(PKG)   /* end H5FA__hdr_alloc() */
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_init
  *
@@ -139,11 +128,12 @@ END_FUNC(PKG)   /* end H5FA__hdr_alloc() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__hdr_init(H5FA_hdr_t *hdr, void *ctx_udata))
+herr_t
+H5FA__hdr_init(H5FA_hdr_t *hdr, void *ctx_udata)
+{
+    herr_t ret_value = SUCCEED;
 
-    /* Local variables */
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(hdr);
@@ -155,55 +145,58 @@ H5FA__hdr_init(H5FA_hdr_t *hdr, void *ctx_udata))
     hdr->stats.nelmts = hdr->cparam.nelmts;
 
     /* 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 fixed array client callback context")
-    } /* end if */
-
-CATCH
+    if (hdr->cparam.cls->crt_context)
+        if (NULL == (hdr->cb_ctx = (*hdr->cparam.cls->crt_context)(ctx_udata)))
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTCREATE, FAIL,
+                        "unable to create fixed array client callback context")
 
-END_FUNC(PKG)   /* end H5FA__hdr_init() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_create
  *
  * Purpose:     Creates a new Fixed Array header in the file
  *
- * Return:      SUCCEED/FAIL
+ * Return:      Success:    Address of new header in the file
+ *              Failure:    HADDR_UNDEF
  *
  * Programmer:  Vailin Choi
  *              Thursday, April 30, 2009
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-haddr_t, HADDR_UNDEF, HADDR_UNDEF,
-H5FA__hdr_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata))
+haddr_t
+H5FA__hdr_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata)
+{
+    H5FA_hdr_t *hdr       = NULL;  /* Fixed array header */
+    hbool_t     inserted  = FALSE; /* Whether the header was inserted into cache */
+    haddr_t     ret_value = HADDR_UNDEF;
 
-    /* Local variables */
-    H5FA_hdr_t *hdr = NULL;     /* Fixed array header */
-    hbool_t inserted = FALSE;   /* Whether the header was inserted into cache */
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(f);
     HDassert(cparam);
 
 #ifndef NDEBUG
-{
-    /* Check for valid parameters */
-    if(cparam->raw_elmt_size == 0)
-        H5E_THROW(H5E_BADVALUE, "element size must be greater than zero")
-    if(cparam->max_dblk_page_nelmts_bits == 0)
-        H5E_THROW(H5E_BADVALUE, "max. # of elements bits must be greater than zero")
-    if(cparam->nelmts == 0)
-        H5E_THROW(H5E_BADVALUE, "# of elements must be greater than zero")
-}
+    {
+        /* Check for valid parameters */
+        if (cparam->raw_elmt_size == 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_BADVALUE, HADDR_UNDEF, "element size must be greater than zero")
+        if (cparam->max_dblk_page_nelmts_bits == 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_BADVALUE, HADDR_UNDEF,
+                        "max. # of elements bits must be greater than zero")
+        if (cparam->nelmts == 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_BADVALUE, HADDR_UNDEF, "# of elements must be greater than zero")
+    }
 #endif /* NDEBUG */
 
     /* Allocate space for the shared information */
-    if(NULL == (hdr = H5FA__hdr_alloc(f)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for Fixed Array shared header")
+    if (NULL == (hdr = H5FA__hdr_alloc(f)))
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, HADDR_UNDEF,
+                    "memory allocation failed for Fixed Array shared header")
 
     hdr->dblk_addr = HADDR_UNDEF;
 
@@ -211,52 +204,54 @@ H5FA__hdr_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata))
     H5MM_memcpy(&hdr->cparam, cparam, sizeof(hdr->cparam));
 
     /* Finish initializing fixed array header */
-    if(H5FA__hdr_init(hdr, ctx_udata) < 0)
-        H5E_THROW(H5E_CANTINIT, "initialization failed for fixed array header")
+    if (H5FA__hdr_init(hdr, ctx_udata) < 0)
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTINIT, HADDR_UNDEF, "initialization failed for fixed array header")
 
     /* Allocate space for the header on disk */
-    if(HADDR_UNDEF == (hdr->addr = H5MF_alloc(f, H5FD_MEM_FARRAY_HDR, (hsize_t)hdr->size)))
-        H5E_THROW(H5E_CANTALLOC, "file allocation failed for Fixed Array header")
+    if (HADDR_UNDEF == (hdr->addr = H5MF_alloc(f, H5FD_MEM_FARRAY_HDR, (hsize_t)hdr->size)))
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, HADDR_UNDEF, "file allocation failed for Fixed 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 fixed array entry proxy")
+    if (hdr->swmr_write)
+        if (NULL == (hdr->top_proxy = H5AC_proxy_entry_create()))
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTCREATE, HADDR_UNDEF, "can't create fixed array entry proxy")
 
     /* Cache the new Fixed Array header */
-    if(H5AC_insert_entry(f, H5AC_FARRAY_HDR, hdr->addr, hdr, H5AC__NO_FLAGS_SET) < 0)
-        H5E_THROW(H5E_CANTINSERT, "can't add fixed array header to cache")
+    if (H5AC_insert_entry(f, H5AC_FARRAY_HDR, hdr->addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTINSERT, HADDR_UNDEF, "can't add fixed 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 fixed array entry as child of array proxy")
+    if (hdr->top_proxy)
+        if (H5AC_proxy_entry_add_child(hdr->top_proxy, f, hdr) < 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTSET, HADDR_UNDEF,
+                        "unable to add fixed array entry as child of array proxy")
 
     /* Set address of array header to return */
     ret_value = hdr->addr;
 
-CATCH
-
-    if(!H5F_addr_defined(ret_value))
-        if(hdr) {
+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 fixed array header from cache")
+            if (inserted)
+                if (H5AC_remove_entry(hdr) < 0)
+                    HDONE_ERROR(H5E_FARRAY, H5E_CANTREMOVE, HADDR_UNDEF,
+                                "unable to remove fixed array header from cache")
 
             /* Release header's disk space */
-            if(H5F_addr_defined(hdr->addr) && H5MF_xfree(f, H5FD_MEM_FARRAY_HDR, hdr->addr, (hsize_t)hdr->size) < 0)
-                H5E_THROW(H5E_CANTFREE, "unable to free Fixed Array header")
+            if (H5F_addr_defined(hdr->addr) &&
+                H5MF_xfree(f, H5FD_MEM_FARRAY_HDR, hdr->addr, (hsize_t)hdr->size) < 0)
+                HDONE_ERROR(H5E_FARRAY, H5E_CANTFREE, HADDR_UNDEF, "unable to free Fixed Array header")
 
             /* Destroy header */
-            if(H5FA__hdr_dest(hdr) < 0)
-                H5E_THROW(H5E_CANTFREE, "unable to destroy Fixed Array header")
-        } /* end if */
+            if (H5FA__hdr_dest(hdr) < 0)
+                HDONE_ERROR(H5E_FARRAY, H5E_CANTFREE, HADDR_UNDEF, "unable to destroy Fixed Array header")
+        }
 
-END_FUNC(PKG)   /* end H5FA__hdr_create() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_incr
  *
@@ -269,26 +264,28 @@ END_FUNC(PKG)   /* end H5FA__hdr_create() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__hdr_incr(H5FA_hdr_t *hdr))
+herr_t
+H5FA__hdr_incr(H5FA_hdr_t *hdr)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(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 fixed array header")
+    if (hdr->rc == 0)
+        if (H5AC_pin_protected_entry(hdr) < 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTPIN, FAIL, "unable to pin fixed array header")
 
     /* Increment reference count on shared header */
     hdr->rc++;
 
-CATCH
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_incr() */
 
-END_FUNC(PKG)   /* end H5FA__hdr_incr() */
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_decr
  *
@@ -301,9 +298,12 @@ END_FUNC(PKG)   /* end H5FA__hdr_incr() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__hdr_decr(H5FA_hdr_t *hdr))
+herr_t
+H5FA__hdr_decr(H5FA_hdr_t *hdr)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
@@ -313,17 +313,16 @@ H5FA__hdr_decr(H5FA_hdr_t *hdr))
     hdr->rc--;
 
     /* Mark header as evictable again when nothing depend on it */
-    if(hdr->rc == 0) {
+    if (hdr->rc == 0) {
         HDassert(hdr->file_rc == 0);
-        if(H5AC_unpin_entry(hdr) < 0)
-            H5E_THROW(H5E_CANTUNPIN, "unable to unpin fixed array header")
-    } /* end if */
-
-CATCH
+        if (H5AC_unpin_entry(hdr) < 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTUNPIN, FAIL, "unable to unpin fixed array header")
+    }
 
-END_FUNC(PKG)   /* end H5FA__hdr_decr() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_fuse_incr
  *
@@ -336,9 +335,10 @@ END_FUNC(PKG)   /* end H5FA__hdr_decr() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, NOERR,
-herr_t, SUCCEED, -,
-H5FA__hdr_fuse_incr(H5FA_hdr_t *hdr))
+herr_t
+H5FA__hdr_fuse_incr(H5FA_hdr_t *hdr)
+{
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Sanity check */
     HDassert(hdr);
@@ -346,24 +346,28 @@ H5FA__hdr_fuse_incr(H5FA_hdr_t *hdr))
     /* Increment file reference count on shared header */
     hdr->file_rc++;
 
-END_FUNC(PKG)   /* end H5FA__hdr_fuse_incr() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FA__hdr_fuse_incr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_fuse_decr
  *
  * Purpose:     Decrement file reference count on shared array header
  *
- * Return:      SUCCEED/FAIL
+ * Return:      Success:    The reference count of the header
+ *              Failure:    Can't fail
  *
  * Programmer:  Vailin Choi
  *              Thursday, April 30, 2009
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, NOERR,
-size_t, 0, -,
-H5FA__hdr_fuse_decr(H5FA_hdr_t *hdr))
+size_t
+H5FA__hdr_fuse_decr(H5FA_hdr_t *hdr)
+{
+    size_t ret_value = 0;
+
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Sanity check */
     HDassert(hdr);
@@ -375,9 +379,9 @@ H5FA__hdr_fuse_decr(H5FA_hdr_t *hdr))
     /* Set return value */
     ret_value = hdr->file_rc;
 
-END_FUNC(PKG)   /* end H5FA__hdr_fuse_decr() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_fuse_decr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_modified
  *
@@ -390,22 +394,24 @@ END_FUNC(PKG)   /* end H5FA__hdr_fuse_decr() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__hdr_modified(H5FA_hdr_t *hdr))
+herr_t
+H5FA__hdr_modified(H5FA_hdr_t *hdr)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
 
     /* Mark header as dirty in cache */
-    if(H5AC_mark_entry_dirty(hdr) < 0)
-        H5E_THROW(H5E_CANTMARKDIRTY, "unable to mark fixed array header as dirty")
-
-CATCH
+    if (H5AC_mark_entry_dirty(hdr) < 0)
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTMARKDIRTY, FAIL, "unable to mark fixed array header as dirty")
 
-END_FUNC(PKG)   /* end H5FA__hdr_modified() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_modified() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FA__hdr_protect
  *
@@ -418,13 +424,14 @@ END_FUNC(PKG)   /* end H5FA__hdr_modified() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-H5FA_hdr_t *, NULL, NULL,
-H5FA__hdr_protect(H5F_t *f, haddr_t fa_addr, void *ctx_udata, unsigned flags))
+H5FA_hdr_t *
+H5FA__hdr_protect(H5F_t *f, haddr_t fa_addr, void *ctx_udata, unsigned flags)
+{
+    H5FA_hdr_t *        hdr;   /* Fixed array header */
+    H5FA_hdr_cache_ud_t udata; /* User data for cache callbacks */
+    H5FA_hdr_t *        ret_value = NULL;
 
-    /* Local variables */
-    H5FA_hdr_t *hdr;            /* Fixed array header */
-    H5FA_hdr_cache_ud_t udata;  /* User data for cache callbacks */
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(f);
@@ -434,34 +441,35 @@ H5FA__hdr_protect(H5F_t *f, haddr_t fa_addr, void *ctx_udata, unsigned flags))
     HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
 
     /* Set up user data for cache callbacks */
-    udata.f = f;
-    udata.addr = fa_addr;
+    udata.f         = f;
+    udata.addr      = fa_addr;
     udata.ctx_udata = ctx_udata;
 
     /* Protect the header */
-    if(NULL == (hdr = (H5FA_hdr_t *)H5AC_protect(f, H5AC_FARRAY_HDR, fa_addr, &udata, flags)))
-        H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array header, address = %llu", (unsigned long long)fa_addr)
-    hdr->f = f;   /* (Must be set again here, in case the header was already in the cache -QAK) */
+    if (NULL == (hdr = (H5FA_hdr_t *)H5AC_protect(f, H5AC_FARRAY_HDR, fa_addr, &udata, flags)))
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, NULL, "unable to protect fixed array header, address = %llu",
+                    (unsigned long long)fa_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) {
+    if (hdr->swmr_write && NULL == hdr->top_proxy) {
         /* Create 'top' proxy for fixed array entries */
-        if(NULL == (hdr->top_proxy = H5AC_proxy_entry_create()))
-            H5E_THROW(H5E_CANTCREATE, "can't create fixed array entry proxy")
+        if (NULL == (hdr->top_proxy = H5AC_proxy_entry_create()))
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTCREATE, NULL, "can't create fixed 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 fixed array entry as child of array proxy")
-    } /* end if */
+        if (H5AC_proxy_entry_add_child(hdr->top_proxy, f, hdr) < 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTSET, NULL,
+                        "unable to add fixed array entry as child of array proxy")
+    }
 
     /* Set return value */
     ret_value = hdr;
 
-CATCH
-
-END_FUNC(PKG)   /* end H5FA__hdr_protect() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FA__hdr_unprotect
  *
@@ -474,24 +482,25 @@ END_FUNC(PKG)   /* end H5FA__hdr_protect() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__hdr_unprotect(H5FA_hdr_t *hdr, unsigned cache_flags))
+herr_t
+H5FA__hdr_unprotect(H5FA_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_FARRAY_HDR, hdr->addr, hdr, cache_flags) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect fixed array hdr, address = %llu", (unsigned long long)hdr->addr)
-
-CATCH
+    if (H5AC_unprotect(hdr->f, H5AC_FARRAY_HDR, hdr->addr, hdr, cache_flags) < 0)
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, FAIL,
+                    "unable to unprotect fixed array hdr, address = %llu", (unsigned long long)hdr->addr)
 
-END_FUNC(PKG)   /* end H5FA__hdr_unprotect() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_unprotect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5FA__hdr_delete
  *
@@ -504,50 +513,50 @@ END_FUNC(PKG)   /* end H5FA__hdr_unprotect() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__hdr_delete(H5FA_hdr_t *hdr))
+herr_t
+H5FA__hdr_delete(H5FA_hdr_t *hdr)
+{
+    unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting header */
+    herr_t   ret_value   = SUCCEED;
 
-    /* Local variables */
-    unsigned cache_flags = H5AC__NO_FLAGS_SET;  /* Flags for unprotecting header */
+    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")
+    if (H5AC_get_entry_status(hdr->f, hdr->addr, &hdr_status) < 0)
+        HGOTO_ERROR(H5E_FARRAY, 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 */
+
 #endif /* NDEBUG */
 
     /* Check for Fixed Array Data block */
-    if(H5F_addr_defined(hdr->dblk_addr)) {
+    if (H5F_addr_defined(hdr->dblk_addr)) {
         /* Delete Fixed Array Data block */
-        if(H5FA__dblock_delete(hdr, hdr->dblk_addr) < 0)
-            H5E_THROW(H5E_CANTDELETE, "unable to delete fixed array data block")
-    } /* end if */
+        if (H5FA__dblock_delete(hdr, hdr->dblk_addr) < 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTDELETE, FAIL, "unable to delete fixed array data block")
+    }
 
     /* 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(H5AC_unprotect(hdr->f, H5AC_FARRAY_HDR, hdr->addr, hdr, cache_flags) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array header")
+    if (H5AC_unprotect(hdr->f, H5AC_FARRAY_HDR, hdr->addr, hdr, cache_flags) < 0)
+        HDONE_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, FAIL, "unable to release fixed array header")
 
-END_FUNC(PKG)   /* end H5FA__hdr_delete() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__hdr_dest
  *
@@ -560,32 +569,35 @@ END_FUNC(PKG)   /* end H5FA__hdr_delete() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__hdr_dest(H5FA_hdr_t *hdr))
+herr_t
+H5FA__hdr_dest(H5FA_hdr_t *hdr)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(hdr);
     HDassert(hdr->rc == 0);
 
     /* 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 fixed array client callback context")
-    } /* end if */
+    if (hdr->cb_ctx) {
+        if ((*hdr->cparam.cls->dst_context)(hdr->cb_ctx) < 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTRELEASE, FAIL,
+                        "unable to destroy fixed array client callback context")
+    }
     hdr->cb_ctx = NULL;
 
     /* Destroy the 'top' proxy */
-    if(hdr->top_proxy) {
-        if(H5AC_proxy_entry_dest(hdr->top_proxy) < 0)
-            H5E_THROW(H5E_CANTRELEASE, "unable to destroy fixed array 'top' proxy")
+    if (hdr->top_proxy) {
+        if (H5AC_proxy_entry_dest(hdr->top_proxy) < 0)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTRELEASE, FAIL, "unable to destroy fixed array 'top' proxy")
         hdr->top_proxy = NULL;
-    } /* end if */
+    }
 
     /* Free the shared info itself */
     hdr = H5FL_FREE(H5FA_hdr_t, hdr);
 
-CATCH
-
-END_FUNC(PKG)   /* end H5FA__hdr_dest() */
-
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__hdr_dest() */