Update reformatting settings, trace wrapping, and printf-format strings (#22)

* Add BEGIN_FUNC / CATCH / END_FUNC to macros

* Remove incorrect trailing '{'

* Update trace script to wrap H5TRACE macros at 110 characters and improve
comments for code that performs this operation.

* Clean up printf-formatting in H5public.h and correct some oversights in the code.

* Reformat with BEGIN_FUNC / END_FUNC handled correctly by clang-format

* Run clang-format on changes.

* Correct H5_SIZEOF_HSIZE_T/H5_SIZEOF_HSSIZE_T macros to match typedef.

* And make the undef value match also.

* Update comment

* Update clang-format actions to exclude generated files.

* Post-process generated H5LTparse.h file as well as H5LTparse.c file.

* Fix formatting

* Update version of github clang-format action

1 files changed, 214 insertions, 214 deletions

diff --git a/src/H5FAhdr.c b/src/H5FAhdr.c
index 9e9faee..f9049f8 100644
--- a/src/H5FAhdr.c
+++ b/src/H5FAhdr.c
@@ -84,33 +84,33 @@ H5FL_DEFINE_STATIC(H5FA_hdr_t);
  */
 BEGIN_FUNC(PKG, ERR, H5FA_hdr_t *, NULL, NULL, H5FA__hdr_alloc(H5F_t *f))
 
-/* Local variables */
-H5FA_hdr_t *hdr = NULL; /* Shared Fixed Array header */
+    /* Local variables */
+    H5FA_hdr_t *hdr = NULL; /* Shared Fixed Array header */
 
-/* Check arguments */
-HDassert(f);
+    /* 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")
+    /* 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")
 
-/* Set non-zero internal fields */
-hdr->addr = HADDR_UNDEF;
+    /* 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->sizeof_addr = H5F_SIZEOF_ADDR(f);
-hdr->sizeof_size = H5F_SIZEOF_SIZE(f);
+    /* Set the internal parameters for the array */
+    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;
+    /* Set the return value */
+    ret_value = hdr;
 
-CATCH
+    CATCH
 
-if (!ret_value)
-    if (hdr && H5FA__hdr_dest(hdr) < 0)
-        H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header")
+    if (!ret_value)
+        if (hdr && H5FA__hdr_dest(hdr) < 0)
+            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header")
 
 END_FUNC(PKG) /* end H5FA__hdr_alloc() */
 
@@ -128,24 +128,24 @@ 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))
 
-/* Local variables */
+    /* Local variables */
 
-/* Check arguments */
-HDassert(hdr);
+    /* Check arguments */
+    HDassert(hdr);
 
-/* Set size of header on disk (locally and in statistics) */
-hdr->stats.hdr_size = hdr->size = H5FA_HEADER_SIZE_HDR(hdr);
+    /* Set size of header on disk (locally and in statistics) */
+    hdr->stats.hdr_size = hdr->size = H5FA_HEADER_SIZE_HDR(hdr);
 
-/* Set number of elements for Fixed Array in statistics */
-hdr->stats.nelmts = hdr->cparam.nelmts;
+    /* Set number of elements for Fixed Array in statistics */
+    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 */
+    /* 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
+    CATCH
 
 END_FUNC(PKG) /* end H5FA__hdr_init() */
 
@@ -164,79 +164,79 @@ END_FUNC(PKG) /* end H5FA__hdr_init() */
 BEGIN_FUNC(PKG, ERR, haddr_t, HADDR_UNDEF, HADDR_UNDEF,
            H5FA__hdr_create(H5F_t *f, const H5FA_create_t *cparam, void *ctx_udata))
 
-/* Local variables */
-H5FA_hdr_t *hdr      = NULL;  /* Fixed array header */
-hbool_t     inserted = FALSE; /* Whether the header was inserted into cache */
+    /* Local variables */
+    H5FA_hdr_t *hdr      = NULL;  /* Fixed array header */
+    hbool_t     inserted = FALSE; /* Whether the header was inserted into cache */
 
-/* Check arguments */
-HDassert(f);
-HDassert(cparam);
+    /* 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)
+            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")
+    }
 #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")
+    /* 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")
 
-hdr->dblk_addr = HADDR_UNDEF;
+    hdr->dblk_addr = HADDR_UNDEF;
 
-/* Set the creation parameters for the array */
-H5MM_memcpy(&hdr->cparam, cparam, sizeof(hdr->cparam));
+    /* Set the creation parameters for the array */
+    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")
+    /* Finish initializing fixed array header */
+    if (H5FA__hdr_init(hdr, ctx_udata) < 0)
+        H5E_THROW(H5E_CANTINIT, "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")
+    /* 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")
 
-/* 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")
+    /* 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")
 
-/* 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")
-inserted = TRUE;
+    /* 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")
+    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")
+    /* 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")
 
-/* Set address of array header to return */
-ret_value = hdr->addr;
+    /* Set address of array header to return */
+    ret_value = hdr->addr;
 
-CATCH
+    CATCH
 
-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 (!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")
 
-        /* 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")
+            /* 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")
 
-        /* Destroy header */
-        if (H5FA__hdr_dest(hdr) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy Fixed Array header")
-    } /* end if */
+            /* Destroy header */
+            if (H5FA__hdr_dest(hdr) < 0)
+                H5E_THROW(H5E_CANTFREE, "unable to destroy Fixed Array header")
+        } /* end if */
 
 END_FUNC(PKG) /* end H5FA__hdr_create() */
 
@@ -254,18 +254,18 @@ END_FUNC(PKG) /* end H5FA__hdr_create() */
  */
 BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_incr(H5FA_hdr_t *hdr))
 
-/* Sanity check */
-HDassert(hdr);
+    /* 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")
+    /* 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")
 
-/* Increment reference count on shared header */
-hdr->rc++;
+    /* Increment reference count on shared header */
+    hdr->rc++;
 
-CATCH
+    CATCH
 
 END_FUNC(PKG) /* end H5FA__hdr_incr() */
 
@@ -283,21 +283,21 @@ END_FUNC(PKG) /* end H5FA__hdr_incr() */
  */
 BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_decr(H5FA_hdr_t *hdr))
 
-/* Sanity check */
-HDassert(hdr);
-HDassert(hdr->rc);
+    /* Sanity check */
+    HDassert(hdr);
+    HDassert(hdr->rc);
 
-/* Decrement reference count on shared header */
-hdr->rc--;
+    /* Decrement reference count on shared header */
+    hdr->rc--;
 
-/* Mark header as evictable again when nothing depend on it */
-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 */
+    /* Mark header as evictable again when nothing depend on it */
+    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
+    CATCH
 
 END_FUNC(PKG) /* end H5FA__hdr_decr() */
 
@@ -315,11 +315,11 @@ END_FUNC(PKG) /* end H5FA__hdr_decr() */
  */
 BEGIN_FUNC(PKG, NOERR, herr_t, SUCCEED, -, H5FA__hdr_fuse_incr(H5FA_hdr_t *hdr))
 
-/* Sanity check */
-HDassert(hdr);
+    /* Sanity check */
+    HDassert(hdr);
 
-/* Increment file reference count on shared header */
-hdr->file_rc++;
+    /* Increment file reference count on shared header */
+    hdr->file_rc++;
 
 END_FUNC(PKG) /* end H5FA__hdr_fuse_incr() */
 
@@ -337,15 +337,15 @@ END_FUNC(PKG) /* end H5FA__hdr_fuse_incr() */
  */
 BEGIN_FUNC(PKG, NOERR, size_t, 0, -, H5FA__hdr_fuse_decr(H5FA_hdr_t *hdr))
 
-/* Sanity check */
-HDassert(hdr);
-HDassert(hdr->file_rc);
+    /* Sanity check */
+    HDassert(hdr);
+    HDassert(hdr->file_rc);
 
-/* Decrement file reference count on shared header */
-hdr->file_rc--;
+    /* Decrement file reference count on shared header */
+    hdr->file_rc--;
 
-/* Set return value */
-ret_value = hdr->file_rc;
+    /* Set return value */
+    ret_value = hdr->file_rc;
 
 END_FUNC(PKG) /* end H5FA__hdr_fuse_decr() */
 
@@ -363,14 +363,14 @@ END_FUNC(PKG) /* end H5FA__hdr_fuse_decr() */
  */
 BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_modified(H5FA_hdr_t *hdr))
 
-/* Sanity check */
-HDassert(hdr);
+    /* 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")
+    /* 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
+    CATCH
 
 END_FUNC(PKG) /* end H5FA__hdr_modified() */
 
@@ -389,43 +389,43 @@ 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))
 
-/* Local variables */
-H5FA_hdr_t *        hdr;   /* Fixed array header */
-H5FA_hdr_cache_ud_t udata; /* User data for cache callbacks */
-
-/* Sanity check */
-HDassert(f);
-HDassert(H5F_addr_defined(fa_addr));
-
-/* only the H5AC__READ_ONLY_FLAG is permitted */
-HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
-
-/* Set up user data for cache callbacks */
-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) */
-
-/* Create top proxy, if it doesn't exist */
-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")
-
-    /* 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 */
+    /* Local variables */
+    H5FA_hdr_t *        hdr;   /* Fixed array header */
+    H5FA_hdr_cache_ud_t udata; /* User data for cache callbacks */
+
+    /* Sanity check */
+    HDassert(f);
+    HDassert(H5F_addr_defined(fa_addr));
+
+    /* only the H5AC__READ_ONLY_FLAG is permitted */
+    HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
+
+    /* Set up user data for cache callbacks */
+    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) */
+
+    /* Create top proxy, if it doesn't exist */
+    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")
+
+        /* 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 */
 
-/* Set return value */
-ret_value = hdr;
+    /* Set return value */
+    ret_value = hdr;
 
-CATCH
+    CATCH
 
 END_FUNC(PKG) /* end H5FA__hdr_protect() */
 
@@ -443,17 +443,17 @@ 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))
 
-/* Local variables */
+    /* Local variables */
 
-/* Sanity check */
-HDassert(hdr);
+    /* 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)
+    /* 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
+    CATCH
 
 END_FUNC(PKG) /* end H5FA__hdr_unprotect() */
 
@@ -471,42 +471,42 @@ END_FUNC(PKG) /* end H5FA__hdr_unprotect() */
  */
 BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_delete(H5FA_hdr_t *hdr))
 
-/* Local variables */
-unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting header */
+    /* Local variables */
+    unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting header */
 
-/* Sanity check */
-HDassert(hdr);
-HDassert(!hdr->file_rc);
+    /* 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)
+            H5E_THROW(H5E_CANTGET, "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);
+    }  /* end block */
 #endif /* NDEBUG */
 
-/* Check for Fixed Array Data block */
-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 */
+    /* Check for Fixed Array Data block */
+    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 */
 
-/* Set flags to finish deleting header on unprotect */
-cache_flags |= H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
+    /* Set flags to finish deleting header on unprotect */
+    cache_flags |= H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
 
-CATCH
+    CATCH
 
-/* 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")
+    /* 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")
 
 END_FUNC(PKG) /* end H5FA__hdr_delete() */
 
@@ -524,27 +524,27 @@ END_FUNC(PKG) /* end H5FA__hdr_delete() */
  */
 BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__hdr_dest(H5FA_hdr_t *hdr))
 
-/* Check arguments */
-HDassert(hdr);
-HDassert(hdr->rc == 0);
+    /* 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 */
-hdr->cb_ctx = NULL;
+    /* 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 */
+    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")
-    hdr->top_proxy = NULL;
-} /* end if */
+    /* 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")
+        hdr->top_proxy = NULL;
+    } /* end if */
 
-/* Free the shared info itself */
-hdr = H5FL_FREE(H5FA_hdr_t, hdr);
+    /* Free the shared info itself */
+    hdr = H5FL_FREE(H5FA_hdr_t, hdr);
 
-CATCH
+    CATCH
 
 END_FUNC(PKG) /* end H5FA__hdr_dest() */