VFD SWMR: Sync with develop (#711)

* Brings CMake updates from develop

* Brings reduction in pedantic casts from develop

* Purges UFAIL from the library (#637)

* Committing clang-format changes

* Purges UFAIL from the library

* H5HL_insert change requested in PR

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

* Removes gratuitous (double)x.yF casts (#632)

* Committing clang-format changes

* Removes gratuitous (double)x.yF casts

* Committing clang-format changes

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

* Committing clang-format changes

* Cleans up a const warning left over from previous constification (#633)

* Committing clang-format changes

* Adds consts to a few global variables

* Cleans up a const warning left over from previous constification

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

* Formatted source

* Bring over some VOL registration changes

* VOL cleanup

* H5VL_request_status_t substitutions

* H5F.c cleanup

* Minor API tweaks from develop

* Moves H5G package init/teardown to H5Gint.c

* H5G cleanup

* H5M cleanup

* H5SM cleanup

* H5T cleanup

* H5R cleanup

* H5Lpublic.h cleanup

* H5L cleanup

* H5O cleanup

* H5A, H5CS, and H5AC cleanup

* Moved H5A init/teardown code to H5Aint.c

* Moves H5D I/O functions to H5D.c

* H5D cleanup

* Misc minor cleanup

* H5P close cleanup

* H5Tpublic.h cleanup

* Fixes err_compat test

* H5PLpublic.h cleanup

* Updates H5Ppublic.h

* H5Fpublic.h updates

* H5A.c cleanup

* Brings over H5Aexists and related changes

* Brings CMake shell testing changes from develop

* Close callback changes

* H5R and H5Tcommit normalization

* err_compat test works now

* H5O tweaks

* Updates VOL registration code

* Brings over H5VL_create_object

* H5Tconv.c reformatting

* H5T.c tweaks

* Brings datatype and reference updates from develop

* Brings VOL plugin loading changes from develop

* Brings event sets from develop

* Brings async functions over

* Tools changes

* Brings over many tools changes from develop

* Brings VOL flags from develop

* Fixes h5dump double/float tests

* Updates h5repack tests

* Brings h5diff test changes from develop

* Last h5dump changes

* Brings test changes from develop

* Committing clang-format changes

* Tidied h5_testing()

* Brings chunk iteration code + misc from develop

* Updates vds test

* Enables external link parallel test

* Brings updated property lists from develop

* H5G changes from develop

* H5MF cleanup

* Brings vfd_swmr test back into CMake

* Updates threadsafe test

* Updates plist test

* Brings recent changes from develop

* Require a C++11 compiler to build the C++ wrappers (#693)

* Committing clang-format changes

* Requires a C++11 compiler to build the C++ wrappers

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

* Fix H5FD_mpio_Debug="rw" can report MPI_count instead of bytes (#699)

* Removes pre-C99 build and header cruft (#700)

* Assumes ANSI C headers exist
* Assumes stdbool.h, stdint.h, and inttypes.h are present
* Assumes the C++ compiler can handle stdint.h
* Removes all work-arounds for missing functionality, especially stdbool.h

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

* Updates release documents

* Brings parallel changes from develop

* Adds a VFD/parallel check program for the VFD SWMR shell test

* Updates MANIFEST

* Disable building VFD SWMR acceptance tests on CMake

* Removes err.h from genall5.c

* Partial cleanup of H5Cpkg.h

* Fixes printf specifiers in H5Cdbg.c

* Java and fortran cmake changes (#694)

* OESS-98 convert plugin option to FetchContent, add tests

* Fixes for pkcfg files because of plugin option

* OESS-98 fix tools test for plugins

* Keep doxygen comments under 100 chars long - format hint

* Whitespace

* HDFFV-11144 - Reclassify CMake messages

* HDFFV-11099/11100 added help text

* Reworked switch statement to compare string instead

* Fix typo

* Update CDash mode

* Correct name of threadsafe

* Correct option name

* Undo accidental commit

* Note LLVM 10 to 11 format default changes

* Update format plugin

* Undo clang-format version 11 changes

* One more correction

* Update supported platforms

* Revert whitespace changes

* Correct whitespace

* Changes from PR#3

* HDFFV-11213 added option to control gcc10 warnings diagnostics

* HDFFV-11212 Use the new references correctly in JNI utility and tests

* format source

* Fix typo

* Add new test file

* HDFFV-11212 - update test and remove unused arg

* Minor non-space formatting changes

* Use H5I_INVALID_ID instead of "-1"

* source formatting

* add missing testfile, update jni function

* Undo commit of debug code

* remove mislocated file

* Fix h5repack test for handling of fapls and id close

* Update h5diff test files usage text

* HDFFV-11212 add new ref tests for JNI export dataset

* src format update

* Remove blank line typo

* src format typo

* long double requires %Lg

* Another long double foramt specifer S.B. %Lg

* issue with t128bit test

* Windows issue with h5dump and type.

* Fix review issues

* refactor function nesting and fix error checks

* format fixes

* Remove untested functions and javadoc quiet comments

* Restore TRY block.

* Change string append errors to memory exception

* revert to H5_JNI_FATAL_ERROR - support functions need work

* Add assertion error for h5util functions

* remove duplicate function

* format fix

* Revert HD function error handling

* Update copyright comments

* GH #386 java folder copyright corrections

* Whitespace

* GH #359 implement and fix tools 1.6 API usage

* remove excessive comments

* Flip inits to correct ifdef section

* rework ifdef to be simpler

* format issue

* Reformat ifdef inits

* remove static attribute

* format compliance

* Update names

* Revert because logic relies on float not being int

* Changes noticed from creating merge of #412

* Double underscore change

* Correct compiler version variable used

* Remove header guard underscores

* Whitespace cleanup

* Split format source and commit changes on repo push

* remove pre-split setting

* Change windows TS to use older VS.

* correct window os name

* HDFFV-11212 JNI export util and Javadoc

* Suggested review changes

* Another change found

* Committing clang-format changes

* HDFFV-11113 long double in tools

* HDFFV-11113 add note

* Disable long double tests for now

* HDFFV-11228 remove arbitrary CMake warning groups.

* Make each flag a string

* Some Javadoc warning fixes

* Updated javadoc fixes

* # WARNING: head commit changed in the meantime

HDFFV-11229 Fix long double usage in tools and java

Changed h5dump and h5ls to just print 128-bit for long double type.
Added test and file for dataset and attributes with all three float
types.

* Committing clang-format changes

* HDFFV-11229 Add release note

* HDFFV-11229 windows testfile needed

* fix typo

* Remove non supported message text

* HDFFV-11229 - change ldouble test to check both native and general

* HDFFV-11229 add second file compare

* HDFFV-11229 fix reference file

* HDFFV-11229 autotools check two refs

* HDFFV-11229 revert back to removal of NATIVE_LDOUBLE in tools output

* Committing clang-format changes

* Update release note

* Update attribute type of ref file

* Change source of ninja for macs

* try port instead of brew

* Recommended is to use brew.

* Undo non long double changes

* remove unneeded file

* Fix perl and doxygen CMake code

* Add "option" command for clang options

* Rework CMake add_custom to use the BYPRODUCTS argument

* Add stamp files to BYPRODUCTS

* Only one copy of file exists

* Fix custom cmmand depends targets

* Fix fortran custom command DEPENDS

* Add LD_LIBRARY_PATH to tests

* Add custom target for DEPENDS

* Add h5detect conditionaly to generated target DEPENDS

* Correct DEPENDS targets

* Parallel builds need the mpi compiler for pkgconfig scripts.

* install only if MPI build

* Fortran target depends

* Remove incorrect source attribute

* doxygen adjustments

* doxygen build updates

* Correct version

* Correct function version - function has been merged to 1.12

* Correct version string for map functions

* Cleanup warnings for tools debug builds

* TRILAB-227 - fix indexing for h5diff selections

* Correct location of pos to index function call

* TRILAB-227 Enable test

* Quote subset args

* Use MATCHES because of AppleClang

* if blocks needed for build modes

* Update list of DT platforms

* VS2019 correctly displays float values

* revert VS2019 change

* Issue #669 remove version from pkgcfg filename

* remove version from h5cc script

* Java reference functions updated

enabled fortran in cmake gcc action yaml file
java reference test changed to correctly test refs
jni reference functions that create ids changed to use jni id logging

* Correct BYPRODUCTS argument

* Correct more genereated files BYPRODUCTS

* BYPRODUCTS must have unique locations

* Fix typo

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

* 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>

* Split H5L.c internal code to H5Lint.c (#691)

* Committing clang-format changes

* Splits internal parts of H5L.c to H5Lint.c

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

* Clean up type size checks in configure.ac (#702)

* Committing clang-format changes

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

1 files changed, 177 insertions, 160 deletions

diff --git a/src/H5FA.c b/src/H5FA.c
index 05b0bd8..ad69ee2 100644
--- a/src/H5FA.c
+++ b/src/H5FA.c
@@ -105,39 +105,40 @@ H5FL_BLK_DEFINE(fa_native_elmt);
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(STATIC, ERR, H5FA_t *, NULL, NULL,
-           H5FA__new(H5F_t *f, haddr_t fa_addr, hbool_t from_open, void *ctx_udata))
+static H5FA_t *
+H5FA__new(H5F_t *f, haddr_t fa_addr, hbool_t from_open, void *ctx_udata)
+{
+    H5FA_t *    fa        = NULL; /* Pointer to new fixed array */
+    H5FA_hdr_t *hdr       = NULL; /* The fixed array header information */
+    H5FA_t *    ret_value = NULL;
 
-    /* Local variables */
-    H5FA_t *    fa  = NULL; /* Pointer to new fixed array */
-    H5FA_hdr_t *hdr = NULL; /* The fixed array header information */
+    FUNC_ENTER_STATIC
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(H5F_addr_defined(fa_addr));
 
     /* Allocate fixed array wrapper */
     if (NULL == (fa = H5FL_CALLOC(H5FA_t)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array info")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, NULL, "memory allocation failed for fixed array info")
 
     /* Lock the array header into memory */
     if (NULL == (hdr = H5FA__hdr_protect(f, fa_addr, ctx_udata, H5AC__READ_ONLY_FLAG)))
-        H5E_THROW(H5E_CANTPROTECT, "unable to load fixed array header")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, NULL, "unable to load fixed array header")
 
     /* Check for pending array deletion */
     if (from_open && hdr->pending_delete)
-        H5E_THROW(H5E_CANTOPENOBJ, "can't open fixed array pending deletion")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTOPENOBJ, NULL, "can't open fixed array pending deletion")
 
     /* Point fixed array wrapper at header and bump it's ref count */
     fa->hdr = hdr;
     if (H5FA__hdr_incr(fa->hdr) < 0)
-        H5E_THROW(H5E_CANTINC, "can't increment reference count on shared array header")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTINC, NULL, "can't increment reference count on shared array header")
 
     /* Increment # of files using this array header */
     if (H5FA__hdr_fuse_incr(fa->hdr) < 0)
-        H5E_THROW(H5E_CANTINC, "can't increment file reference count on shared array header")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTINC, NULL,
+                    "can't increment file reference count on shared array header")
 
     /* Set file pointer for this array open context */
     fa->f = f;
@@ -145,15 +146,15 @@ BEGIN_FUNC(STATIC, ERR, H5FA_t *, NULL, NULL,
     /* Set the return value */
     ret_value = fa;
 
-    CATCH
-
+done:
     if (hdr && H5FA__hdr_unprotect(hdr, H5AC__NO_FLAGS_SET) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array header")
+        HDONE_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, NULL, "unable to release fixed array header")
     if (!ret_value)
         if (fa && H5FA_close(fa) < 0)
-            H5E_THROW(H5E_CLOSEERROR, "unable to close fixed array")
+            HDONE_ERROR(H5E_FARRAY, H5E_CLOSEERROR, NULL, "unable to close fixed array")
 
-END_FUNC(STATIC) /* end H5FA__new() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__new() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_create
@@ -168,16 +169,16 @@ END_FUNC(STATIC) /* end H5FA__new() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, H5FA_t *, NULL, NULL,
-           H5FA_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata))
-
-    /* Local variables */
+H5FA_t *
+H5FA_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata)
+{
     H5FA_t *fa = NULL; /* Pointer to new fixed array */
     haddr_t fa_addr;   /* Fixed array header address */
+    H5FA_t *ret_value = NULL;
 
-    /*
-     * Check arguments.
-     */
+    FUNC_ENTER_NOAPI(NULL)
+
+    /* Check arguments */
     HDassert(f);
     HDassert(cparam);
 
@@ -186,22 +187,23 @@ BEGIN_FUNC(PRIV, ERR, H5FA_t *, NULL, NULL,
 
     /* Create fixed array header */
     if (HADDR_UNDEF == (fa_addr = H5FA__hdr_create(f, cparam, ctx_udata)))
-        H5E_THROW(H5E_CANTINIT, "can't create fixed array header")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTINIT, NULL, "can't create fixed array header")
 
     /* Allocate and initialize new fixed array wrapper */
     if (NULL == (fa = H5FA__new(f, fa_addr, FALSE, ctx_udata)))
-        H5E_THROW(H5E_CANTINIT, "allocation and/or initialization failed for fixed array wrapper")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTINIT, NULL,
+                    "allocation and/or initialization failed for fixed array wrapper")
 
     /* Set the return value */
     ret_value = fa;
 
-    CATCH
-
+done:
     if (!ret_value)
         if (fa && H5FA_close(fa) < 0)
-            H5E_THROW(H5E_CLOSEERROR, "unable to close fixed array")
+            HDONE_ERROR(H5E_FARRAY, H5E_CLOSEERROR, NULL, "unable to close fixed array")
 
-END_FUNC(PRIV) /* end H5FA_create() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA_create() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_open
@@ -216,31 +218,33 @@ END_FUNC(PRIV) /* end H5FA_create() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, H5FA_t *, NULL, NULL, H5FA_open(H5F_t *f, haddr_t fa_addr, void *ctx_udata))
+H5FA_t *
+H5FA_open(H5F_t *f, haddr_t fa_addr, void *ctx_udata)
+{
+    H5FA_t *fa        = NULL; /* Pointer to new fixed array wrapper */
+    H5FA_t *ret_value = NULL;
 
-    /* Local variables */
-    H5FA_t *fa = NULL; /* Pointer to new fixed array wrapper */
+    FUNC_ENTER_NOAPI(NULL)
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(H5F_addr_defined(fa_addr));
 
     /* Allocate and initialize new fixed array wrapper */
     if (NULL == (fa = H5FA__new(f, fa_addr, TRUE, ctx_udata)))
-        H5E_THROW(H5E_CANTINIT, "allocation and/or initialization failed for fixed array wrapper")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTINIT, NULL,
+                    "allocation and/or initialization failed for fixed array wrapper")
 
     /* Set the return value */
     ret_value = fa;
 
-    CATCH
-
+done:
     if (!ret_value)
         if (fa && H5FA_close(fa) < 0)
-            H5E_THROW(H5E_CLOSEERROR, "unable to close fixed array")
+            HDONE_ERROR(H5E_FARRAY, H5E_CLOSEERROR, NULL, "unable to close fixed array")
 
-END_FUNC(PRIV) /* end H5FA_open() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA_open() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_get_nelmts
@@ -254,20 +258,20 @@ END_FUNC(PRIV) /* end H5FA_open() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, NOERR, herr_t, SUCCEED, -, H5FA_get_nelmts(const H5FA_t *fa, hsize_t *nelmts))
-
-    /* Local variables */
+herr_t
+H5FA_get_nelmts(const H5FA_t *fa, hsize_t *nelmts)
+{
+    FUNC_ENTER_NOAPI_NOERR
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(fa);
     HDassert(nelmts);
 
     /* Retrieve the current number of elements in the fixed array */
     *nelmts = fa->hdr->stats.nelmts;
 
-END_FUNC(PRIV) /* end H5FA_get_nelmts() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FA_get_nelmts() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_get_addr
@@ -281,13 +285,12 @@ END_FUNC(PRIV) /* end H5FA_get_nelmts() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, NOERR, herr_t, SUCCEED, -, H5FA_get_addr(const H5FA_t *fa, haddr_t *addr))
-
-    /* Local variables */
+herr_t
+H5FA_get_addr(const H5FA_t *fa, haddr_t *addr)
+{
+    FUNC_ENTER_NOAPI_NOERR
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(fa);
     HDassert(fa->hdr);
     HDassert(addr);
@@ -295,7 +298,8 @@ BEGIN_FUNC(PRIV, NOERR, herr_t, SUCCEED, -, H5FA_get_addr(const H5FA_t *fa, hadd
     /* Retrieve the address of the fixed array's header */
     *addr = fa->hdr->addr;
 
-END_FUNC(PRIV) /* end H5FA_get_addr() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FA_get_addr() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_set
@@ -309,9 +313,9 @@ END_FUNC(PRIV) /* end H5FA_get_addr() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_set(const H5FA_t *fa, hsize_t idx, const void *elmt))
-
-    /* Local variables */
+herr_t
+H5FA_set(const H5FA_t *fa, hsize_t idx, const void *elmt)
+{
     H5FA_hdr_t *      hdr       = fa->hdr;            /* Header for fixed array */
     H5FA_dblock_t *   dblock    = NULL;               /* Pointer to fixed array Data block */
     H5FA_dblk_page_t *dblk_page = NULL;               /* Pointer to fixed array Data block page */
@@ -319,10 +323,11 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_set(const H5FA_t *fa, hsize_t
     unsigned dblk_page_cache_flags =
         H5AC__NO_FLAGS_SET;    /* Flags to unprotecting FIxed Array Data block page */
     hbool_t hdr_dirty = FALSE; /* Whether header information changed */
+    herr_t  ret_value = SUCCEED;
 
-    /*
-     * Check arguments.
-     */
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check arguments */
     HDassert(fa);
     HDassert(fa->hdr);
 
@@ -334,15 +339,16 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_set(const H5FA_t *fa, hsize_t
         /* Create the data block */
         hdr->dblk_addr = H5FA__dblock_create(hdr, &hdr_dirty);
         if (!H5F_addr_defined(hdr->dblk_addr))
-            H5E_THROW(H5E_CANTCREATE, "unable to create fixed array data block")
-    } /* end if */
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTCREATE, FAIL, "unable to create fixed array data block")
+    }
 
     HDassert(idx < hdr->cparam.nelmts);
 
     /* Protect data block */
     if (NULL == (dblock = H5FA__dblock_protect(hdr, hdr->dblk_addr, H5AC__NO_FLAGS_SET)))
-        H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array data block, address = %llu",
-                  (unsigned long long)hdr->dblk_addr)
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, FAIL,
+                    "unable to protect fixed array data block, address = %llu",
+                    (unsigned long long)hdr->dblk_addr)
 
     /* Check for paging data block */
     if (!dblock->npages) {
@@ -375,7 +381,7 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_set(const H5FA_t *fa, hsize_t
         if (!H5VM_bit_get(dblock->dblk_page_init, page_idx)) {
             /* Create the data block page */
             if (H5FA__dblk_page_create(hdr, dblk_page_addr, dblk_page_nelmts) < 0)
-                H5E_THROW(H5E_CANTCREATE, "unable to create data block page")
+                HGOTO_ERROR(H5E_FARRAY, H5E_CANTCREATE, FAIL, "unable to create data block page")
 
             /* Mark data block page as initialized in data block */
             H5VM_bit_set(dblock->dblk_page_init, page_idx, TRUE);
@@ -385,8 +391,9 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_set(const H5FA_t *fa, hsize_t
         /* Protect the data block page */
         if (NULL ==
             (dblk_page = H5FA__dblk_page_protect(hdr, dblk_page_addr, dblk_page_nelmts, H5AC__NO_FLAGS_SET)))
-            H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array data block page, address = %llu",
-                      (unsigned long long)dblk_page_addr)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, FAIL,
+                        "unable to protect fixed array data block page, address = %llu",
+                        (unsigned long long)dblk_page_addr)
 
         /* Set the element in the data block page */
         H5MM_memcpy(((uint8_t *)dblk_page->elmts) + (hdr->cparam.cls->nat_elmt_size * elmt_idx), elmt,
@@ -394,19 +401,20 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_set(const H5FA_t *fa, hsize_t
         dblk_page_cache_flags |= H5AC__DIRTIED_FLAG;
     } /* end else */
 
-    CATCH
+done:
     /* Check for header modified */
     if (hdr_dirty)
         if (H5FA__hdr_modified(hdr) < 0)
-            H5E_THROW(H5E_CANTMARKDIRTY, "unable to mark fixed array header as modified")
+            HDONE_ERROR(H5E_FARRAY, H5E_CANTMARKDIRTY, FAIL, "unable to mark fixed array header as modified")
 
     /* Release resources */
     if (dblock && H5FA__dblock_unprotect(dblock, dblock_cache_flags) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array data block")
+        HDONE_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, FAIL, "unable to release fixed array data block")
     if (dblk_page && H5FA__dblk_page_unprotect(dblk_page, dblk_page_cache_flags) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array data block page")
+        HDONE_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, FAIL, "unable to release fixed array data block page")
 
-END_FUNC(PRIV) /* end H5FA_set() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA_set() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_get
@@ -420,16 +428,17 @@ END_FUNC(PRIV) /* end H5FA_set() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_get(const H5FA_t *fa, hsize_t idx, void *elmt))
-
-    /* Local variables */
+herr_t
+H5FA_get(const H5FA_t *fa, hsize_t idx, void *elmt)
+{
     H5FA_hdr_t *      hdr       = fa->hdr; /* Header for FA */
     H5FA_dblock_t *   dblock    = NULL;    /* Pointer to data block for FA */
     H5FA_dblk_page_t *dblk_page = NULL;    /* Pointer to data block page for FA */
+    herr_t            ret_value = SUCCEED;
 
-    /*
-     * Check arguments.
-     */
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check arguments */
     HDassert(fa);
     HDassert(fa->hdr);
 
@@ -440,14 +449,15 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_get(const H5FA_t *fa, hsize_t
     if (!H5F_addr_defined(hdr->dblk_addr)) {
         /* Call the class's 'fill' callback */
         if ((hdr->cparam.cls->fill)(elmt, (size_t)1) < 0)
-            H5E_THROW(H5E_CANTSET, "can't set element to class's fill value")
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTSET, FAIL, "can't set element to class's fill value")
     } /* end if */
     else {
         /* Get the data block */
         HDassert(H5F_addr_defined(hdr->dblk_addr));
         if (NULL == (dblock = H5FA__dblock_protect(hdr, hdr->dblk_addr, H5AC__READ_ONLY_FLAG)))
-            H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array data block, address = %llu",
-                      (unsigned long long)hdr->dblk_addr)
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, FAIL,
+                        "unable to protect fixed array data block, address = %llu",
+                        (unsigned long long)hdr->dblk_addr)
 
         /* Check for paged data block */
         if (!dblock->npages)
@@ -464,10 +474,10 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_get(const H5FA_t *fa, hsize_t
             if (!H5VM_bit_get(dblock->dblk_page_init, page_idx)) {
                 /* Call the class's 'fill' callback */
                 if ((hdr->cparam.cls->fill)(elmt, (size_t)1) < 0)
-                    H5E_THROW(H5E_CANTSET, "can't set element to class's fill value")
+                    HGOTO_ERROR(H5E_FARRAY, H5E_CANTSET, FAIL, "can't set element to class's fill value")
 
                 /* We've retrieved the value, leave now */
-                H5_LEAVE(SUCCEED)
+                HGOTO_DONE(SUCCEED)
             }                             /* end if */
             else {                        /* get the page */
                 size_t  dblk_page_nelmts; /* # of elements in a data block page */
@@ -490,9 +500,9 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_get(const H5FA_t *fa, hsize_t
                 /* Protect the data block page */
                 if (NULL == (dblk_page = H5FA__dblk_page_protect(hdr, dblk_page_addr, dblk_page_nelmts,
                                                                  H5AC__READ_ONLY_FLAG)))
-                    H5E_THROW(H5E_CANTPROTECT,
-                              "unable to protect fixed array data block page, address = %llu",
-                              (unsigned long long)dblk_page_addr)
+                    HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, FAIL,
+                                "unable to protect fixed array data block page, address = %llu",
+                                (unsigned long long)dblk_page_addr)
 
                 /* Retrieve element from data block */
                 H5MM_memcpy(elmt, ((uint8_t *)dblk_page->elmts) + (hdr->cparam.cls->nat_elmt_size * elmt_idx),
@@ -501,13 +511,14 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_get(const H5FA_t *fa, hsize_t
         }     /* end else */
     }         /* end else */
 
-    CATCH
+done:
     if (dblock && H5FA__dblock_unprotect(dblock, H5AC__NO_FLAGS_SET) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array data block")
+        HDONE_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, FAIL, "unable to release fixed array data block")
     if (dblk_page && H5FA__dblk_page_unprotect(dblk_page, H5AC__NO_FLAGS_SET) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array data block page")
+        HDONE_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, FAIL, "unable to release fixed array data block page")
 
-END_FUNC(PRIV) /* end H5FA_get() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA_get() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_close
@@ -521,18 +532,19 @@ END_FUNC(PRIV) /* end H5FA_get() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_close(H5FA_t *fa))
-
-    /* Local variables */
+herr_t
+H5FA_close(H5FA_t *fa)
+{
     hbool_t pending_delete = FALSE;       /* Whether the array is pending deletion */
     haddr_t fa_addr        = HADDR_UNDEF; /* Address of array (for deletion) */
+    herr_t  ret_value      = SUCCEED;
 
-    /*
-     * Check arguments.
-     */
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check arguments */
     HDassert(fa);
 
-    /* Close the header, if it was set */
+    /* Close the header if it was set */
     if (fa->hdr) {
         /* Decrement file reference & check if this is the last open fixed array using the shared array header
          */
@@ -562,7 +574,8 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_close(H5FA_t *fa))
 
                 /* Check the header's status in the metadata cache */
                 if (H5AC_get_entry_status(fa->f, fa_addr, &hdr_status) < 0)
-                    H5E_THROW(H5E_CANTGET, "unable to check metadata cache status for fixed array header")
+                    HGOTO_ERROR(H5E_FARRAY, H5E_CANTGET, FAIL,
+                                "unable to check metadata cache status for fixed array header")
 
                 /* Sanity checks on header */
                 HDassert(hdr_status & H5AC_ES__IN_CACHE);
@@ -574,7 +587,7 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_close(H5FA_t *fa))
             /* Lock the array header into memory */
             /* (OK to pass in NULL for callback context, since we know the header must be in the cache) */
             if (NULL == (hdr = H5FA__hdr_protect(fa->f, fa_addr, NULL, H5AC__NO_FLAGS_SET)))
-                H5E_THROW(H5E_CANTLOAD, "unable to load fixed array header")
+                HGOTO_ERROR(H5E_FARRAY, H5E_CANTLOAD, FAIL, "unable to load fixed array header")
 
             /* Set the shared array header's file context for this operation */
             hdr->f = fa->f;
@@ -584,11 +597,12 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_close(H5FA_t *fa))
              *  immediately -QAK)
              */
             if (H5FA__hdr_decr(fa->hdr) < 0)
-                H5E_THROW(H5E_CANTDEC, "can't decrement reference count on shared array header")
+                HGOTO_ERROR(H5E_FARRAY, H5E_CANTDEC, FAIL,
+                            "can't decrement reference count on shared array header")
 
             /* Delete array, starting with header (unprotects header) */
             if (H5FA__hdr_delete(hdr) < 0)
-                H5E_THROW(H5E_CANTDELETE, "unable to delete fixed array")
+                HGOTO_ERROR(H5E_FARRAY, H5E_CANTDELETE, FAIL, "unable to delete fixed array")
         } /* end if */
         else {
             /* Decrement the reference count on the array header */
@@ -596,16 +610,17 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_close(H5FA_t *fa))
              *  immediately -QAK)
              */
             if (H5FA__hdr_decr(fa->hdr) < 0)
-                H5E_THROW(H5E_CANTDEC, "can't decrement reference count on shared array header")
+                HGOTO_ERROR(H5E_FARRAY, H5E_CANTDEC, FAIL,
+                            "can't decrement reference count on shared array header")
         } /* end else */
     }     /* end if */
 
     /* Release the fixed array wrapper */
     fa = H5FL_FREE(H5FA_t, fa);
 
-    CATCH
-
-END_FUNC(PRIV) /* end H5FA_close() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA_close() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_delete
@@ -619,21 +634,22 @@ END_FUNC(PRIV) /* end H5FA_close() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_delete(H5F_t *f, haddr_t fa_addr, void *ctx_udata))
+herr_t
+H5FA_delete(H5F_t *f, haddr_t fa_addr, void *ctx_udata)
+{
+    H5FA_hdr_t *hdr       = NULL; /* The fixed array header information */
+    herr_t      ret_value = SUCCEED;
 
-    /* Local variables */
-    H5FA_hdr_t *hdr = NULL; /* The fixed array header information */
+    FUNC_ENTER_NOAPI(FAIL)
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(f);
     HDassert(H5F_addr_defined(fa_addr));
 
     /* Lock the array header into memory */
     if (NULL == (hdr = H5FA__hdr_protect(f, fa_addr, ctx_udata, H5AC__NO_FLAGS_SET)))
-        H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array header, address = %llu",
-                  (unsigned long long)fa_addr)
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTPROTECT, FAIL, "unable to protect fixed array header, address = %llu",
+                    (unsigned long long)fa_addr)
 
     /* Check for files using shared array header */
     if (hdr->file_rc)
@@ -644,17 +660,17 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_delete(H5F_t *f, haddr_t fa_ad
 
         /* Delete array now, starting with header (unprotects header) */
         if (H5FA__hdr_delete(hdr) < 0)
-            H5E_THROW(H5E_CANTDELETE, "unable to delete fixed array")
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTDELETE, FAIL, "unable to delete fixed array")
         hdr = NULL;
-    } /* end if */
-
-    CATCH
+    }
 
-    /* Unprotect the header, if an error occurred */
+done:
+    /* Unprotect the header if an error occurred */
     if (hdr && H5FA__hdr_unprotect(hdr, H5AC__NO_FLAGS_SET) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array header")
+        HDONE_ERROR(H5E_FARRAY, H5E_CANTUNPROTECT, FAIL, "unable to release fixed array header")
 
-END_FUNC(PRIV) /* end H5FA_delete() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA_delete() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_iterate
@@ -671,44 +687,44 @@ END_FUNC(PRIV) /* end H5FA_delete() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, int, H5_ITER_CONT, H5_ITER_ERROR,
-           H5FA_iterate(H5FA_t *fa, H5FA_operator_t op, void *udata))
-
-    /* Local variables */
+int
+H5FA_iterate(H5FA_t *fa, H5FA_operator_t op, void *udata)
+{
     uint8_t *elmt = NULL;
     hsize_t  u;
-    int      cb_ret = H5_ITER_CONT; /* Return value from callback */
+    int      ret_value = H5_ITER_CONT;
 
-    /*
-     * Check arguments.
-     */
+    FUNC_ENTER_NOAPI(H5_ITER_ERROR)
+
+    /* Check arguments */
     HDassert(fa);
     HDassert(op);
     HDassert(udata);
 
     /* Allocate space for a native array element */
     if (NULL == (elmt = H5FL_BLK_MALLOC(fa_native_elmt, fa->hdr->cparam.cls->nat_elmt_size)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array element")
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTALLOC, H5_ITER_ERROR,
+                    "memory allocation failed for fixed array element")
 
     /* Iterate over all elements in array */
-    for (u = 0; u < fa->hdr->stats.nelmts && cb_ret == H5_ITER_CONT; u++) {
+    for (u = 0; u < fa->hdr->stats.nelmts && ret_value == H5_ITER_CONT; u++) {
         /* Get array element */
         if (H5FA_get(fa, u, elmt) < 0)
-            H5E_THROW(H5E_CANTGET, "unable to delete fixed array")
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTGET, H5_ITER_ERROR, "unable to delete fixed array")
 
-        /* Make callback */
-        if ((cb_ret = (*op)(u, elmt, udata)) < 0) {
-            H5E_PRINTF(H5E_BADITER, "iterator function failed");
-            H5_LEAVE(cb_ret)
-        } /* end if */
-    }     /* end for */
-
-    CATCH
+        /* Invoke callback */
+        if ((ret_value = (*op)(u, elmt, udata)) < 0) {
+            HERROR(H5E_FARRAY, H5E_BADITER, "iteration callback error");
+            break;
+        }
+    }
 
+done:
     if (elmt)
         elmt = H5FL_BLK_FREE(fa_native_elmt, elmt);
 
-END_FUNC(PRIV) /* end H5FA_iterate() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA_iterate() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_depend
@@ -723,14 +739,15 @@ END_FUNC(PRIV) /* end H5FA_iterate() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_depend(H5FA_t *fa, H5AC_proxy_entry_t *parent))
+herr_t
+H5FA_depend(H5FA_t *fa, H5AC_proxy_entry_t *parent)
+{
+    H5FA_hdr_t *hdr       = fa->hdr; /* Header for FA */
+    herr_t      ret_value = SUCCEED;
 
-    /* Local variables */
-    H5FA_hdr_t *hdr = fa->hdr; /* Header for FA */
+    FUNC_ENTER_NOAPI(FAIL)
 
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(fa);
     HDassert(hdr);
     HDassert(parent);
@@ -749,13 +766,13 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5FA_depend(H5FA_t *fa, H5AC_proxy_
 
         /* Add the fixed array as a child of the parent (proxy) */
         if (H5AC_proxy_entry_add_child(parent, hdr->f, hdr->top_proxy) < 0)
-            H5E_THROW(H5E_CANTSET, "unable to add fixed array as child of proxy")
+            HGOTO_ERROR(H5E_FARRAY, H5E_CANTSET, FAIL, "unable to add fixed array as child of proxy")
         hdr->parent = parent;
-    } /* end if */
-
-    CATCH
+    }
 
-END_FUNC(PRIV) /* end H5FA_depend() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA_depend() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5FA_patch_file
@@ -769,17 +786,17 @@ END_FUNC(PRIV) /* end H5FA_depend() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, NOERR, herr_t, SUCCEED, -, H5FA_patch_file(H5FA_t *fa, H5F_t *f))
+herr_t
+H5FA_patch_file(H5FA_t *fa, H5F_t *f)
+{
+    FUNC_ENTER_NOAPI_NOERR
 
-    /* Local variables */
-
-    /*
-     * Check arguments.
-     */
+    /* Check arguments */
     HDassert(fa);
     HDassert(f);
 
     if (fa->f != f || fa->hdr->f != f)
         fa->f = fa->hdr->f = f;
 
-END_FUNC(PRIV) /* end H5FA_patch_file() */
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FA_patch_file() */