Clang-format of source files

1 files changed, 232 insertions, 251 deletions

diff --git a/src/H5FAdblock.c b/src/H5FAdblock.c
index a6a8ced..09585c5 100644
--- a/src/H5FAdblock.c
+++ b/src/H5FAdblock.c
@@ -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 "H5FLprivate.h"    /* Free Lists                               */
-#include "H5MFprivate.h"    /* File memory management                   */
-
+#include "H5private.h"   /* Generic Functions                        */
+#include "H5Eprivate.h"  /* Error handling                           */
+#include "H5FApkg.h"     /* Fixed Arrays                             */
+#include "H5FLprivate.h" /* Free Lists                               */
+#include "H5MFprivate.h" /* File memory management                   */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -85,7 +76,6 @@ H5FL_BLK_DEFINE(chunk_elmts);
 /* Declare a free list to manage blocks of 'page init' bitmasks */
 H5FL_BLK_DEFINE(fa_page_init);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__dblock_alloc
  *
@@ -98,78 +88,75 @@ H5FL_BLK_DEFINE(fa_page_init);
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-H5FA_dblock_t *, NULL, NULL,
-H5FA__dblock_alloc(H5FA_hdr_t *hdr))
+BEGIN_FUNC(PKG, ERR, H5FA_dblock_t *, NULL, NULL, H5FA__dblock_alloc(H5FA_hdr_t *hdr))
 
-    /* Local variables */
-    H5FA_dblock_t *dblock = NULL;          /* fixed array data block */
+/* Local variables */
+H5FA_dblock_t *dblock = NULL; /* fixed array data block */
 
-    /* Check arguments */
-    HDassert(hdr);
-    HDassert(hdr->cparam.nelmts > 0);
+/* Check arguments */
+HDassert(hdr);
+HDassert(hdr->cparam.nelmts > 0);
 
-    /* Allocate memory for the data block */
-    if(NULL == (dblock = H5FL_CALLOC(H5FA_dblock_t)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array data block")
+/* Allocate memory for the data block */
+if (NULL == (dblock = H5FL_CALLOC(H5FA_dblock_t)))
+    H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array data block")
 
-    /* Share common array information */
-    if(H5FA__hdr_incr(hdr) < 0)
-        H5E_THROW(H5E_CANTINC, "can't increment reference count on shared array header")
-    dblock->hdr = hdr;
+/* Share common array information */
+if (H5FA__hdr_incr(hdr) < 0)
+    H5E_THROW(H5E_CANTINC, "can't increment reference count on shared array header")
+dblock->hdr = hdr;
 
-    /* Set non-zero internal fields */
-    dblock->dblk_page_nelmts = (size_t)1 << hdr->cparam.max_dblk_page_nelmts_bits;
+/* Set non-zero internal fields */
+dblock->dblk_page_nelmts = (size_t)1 << hdr->cparam.max_dblk_page_nelmts_bits;
 
-    /* Check if this data block should be paged */
-    if(hdr->cparam.nelmts > dblock->dblk_page_nelmts) {
-        /* Compute number of pages */
-        hsize_t npages = ((hdr->cparam.nelmts + dblock->dblk_page_nelmts) - 1) / dblock->dblk_page_nelmts;
+/* Check if this data block should be paged */
+if (hdr->cparam.nelmts > dblock->dblk_page_nelmts) {
+    /* Compute number of pages */
+    hsize_t npages = ((hdr->cparam.nelmts + dblock->dblk_page_nelmts) - 1) / dblock->dblk_page_nelmts;
 
-        /* Safely assign the number of pages */
-        H5_CHECKED_ASSIGN(dblock->npages, size_t, npages, hsize_t);
+    /* Safely assign the number of pages */
+    H5_CHECKED_ASSIGN(dblock->npages, size_t, npages, hsize_t);
 
-        /* Sanity check that we have at least 1 page */
-        HDassert(dblock->npages > 0);
+    /* Sanity check that we have at least 1 page */
+    HDassert(dblock->npages > 0);
 
-        /* Compute size of 'page init' flag array, in bytes */
-        dblock->dblk_page_init_size = (dblock->npages + 7) / 8;
-        HDassert(dblock->dblk_page_init_size > 0);
+    /* Compute size of 'page init' flag array, in bytes */
+    dblock->dblk_page_init_size = (dblock->npages + 7) / 8;
+    HDassert(dblock->dblk_page_init_size > 0);
 
-        /* Allocate space for 'page init' flags */
-        if(NULL == (dblock->dblk_page_init = H5FL_BLK_CALLOC(fa_page_init, dblock->dblk_page_init_size)))
-            H5E_THROW(H5E_CANTALLOC, "memory allocation failed for page init bitmask")
+    /* Allocate space for 'page init' flags */
+    if (NULL == (dblock->dblk_page_init = H5FL_BLK_CALLOC(fa_page_init, dblock->dblk_page_init_size)))
+        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for page init bitmask")
 
-        /* Compute data block page size */
-        dblock->dblk_page_size = (dblock->dblk_page_nelmts * hdr->cparam.raw_elmt_size) + H5FA_SIZEOF_CHKSUM;
+    /* Compute data block page size */
+    dblock->dblk_page_size = (dblock->dblk_page_nelmts * hdr->cparam.raw_elmt_size) + H5FA_SIZEOF_CHKSUM;
 
-        /* Compute the # of elements on last page */
-        if(0 == hdr->cparam.nelmts % dblock->dblk_page_nelmts)
-            dblock->last_page_nelmts = dblock->dblk_page_nelmts;
-        else
-            dblock->last_page_nelmts = (size_t)(hdr->cparam.nelmts % dblock->dblk_page_nelmts);
-    } /* end if */
-    else {
-        hsize_t dblk_size = hdr->cparam.nelmts * hdr->cparam.cls->nat_elmt_size;
+    /* Compute the # of elements on last page */
+    if (0 == hdr->cparam.nelmts % dblock->dblk_page_nelmts)
+        dblock->last_page_nelmts = dblock->dblk_page_nelmts;
+    else
+        dblock->last_page_nelmts = (size_t)(hdr->cparam.nelmts % dblock->dblk_page_nelmts);
+} /* end if */
+else {
+    hsize_t dblk_size = hdr->cparam.nelmts * hdr->cparam.cls->nat_elmt_size;
 
-        /* Allocate buffer for elements in data block */
-        H5_CHECK_OVERFLOW(dblk_size, /* From: */hsize_t, /* To: */size_t);
-        if(NULL == (dblock->elmts = H5FL_BLK_MALLOC(chunk_elmts, (size_t)dblk_size)))
-            H5E_THROW(H5E_CANTALLOC, "memory allocation failed for data block element buffer")
-    } /* end else */
+    /* Allocate buffer for elements in data block */
+    H5_CHECK_OVERFLOW(dblk_size, /* From: */ hsize_t, /* To: */ size_t);
+    if (NULL == (dblock->elmts = H5FL_BLK_MALLOC(chunk_elmts, (size_t)dblk_size)))
+        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for data block element buffer")
+} /* end else */
 
-    /* Set the return value */
-    ret_value = dblock;
+/* Set the return value */
+ret_value = dblock;
 
 CATCH
 
-    if(!ret_value)
-        if(dblock && H5FA__dblock_dest(dblock) < 0)
-            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block")
+if (!ret_value)
+    if (dblock && H5FA__dblock_dest(dblock) < 0)
+        H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block")
 
-END_FUNC(PKG)   /* end H5FA__dblock_alloc() */
+END_FUNC(PKG) /* end H5FA__dblock_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__dblock_create
  *
@@ -182,76 +169,75 @@ END_FUNC(PKG)   /* end H5FA__dblock_alloc() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-haddr_t, HADDR_UNDEF, HADDR_UNDEF,
-H5FA__dblock_create(H5FA_hdr_t *hdr, hbool_t *hdr_dirty))
-
-    /* Local variables */
-    H5FA_dblock_t *dblock = NULL;       /* Fixed array data block */
-    haddr_t dblock_addr;                /* Fixed array data block address */
-    hbool_t inserted = FALSE;           /* Whether the header was inserted into cache */
-
-    /* Sanity check */
-    HDassert(hdr);
-    HDassert(hdr_dirty);
-
-    /* Allocate the data block */
-    if(NULL == (dblock = H5FA__dblock_alloc(hdr)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array data block")
-
-    /* Set size of data block on disk */
-    hdr->stats.dblk_size = dblock->size = H5FA_DBLOCK_SIZE(dblock);
-
-    /* Allocate space for the data block on disk */
-    if(HADDR_UNDEF == (dblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_FARRAY_DBLOCK, (hsize_t)dblock->size)))
-        H5E_THROW(H5E_CANTALLOC, "file allocation failed for fixed array data block")
-    dblock->addr = dblock_addr;
-
-    /* Don't initialize elements if paged */
-    if(!dblock->npages)
-        /* Clear any elements in data block to fill value */
-        if((hdr->cparam.cls->fill)(dblock->elmts, (size_t)hdr->cparam.nelmts) < 0)
-            H5E_THROW(H5E_CANTSET, "can't set fixed array data block elements to class's fill value")
-
-    /* Cache the new fixed array data block */
-    if(H5AC_insert_entry(hdr->f, H5AC_FARRAY_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
-        H5E_THROW(H5E_CANTINSERT, "can't add fixed array data block to cache")
-    inserted = TRUE;
-
-    /* Add data block as child of 'top' proxy */
-    if(hdr->top_proxy) {
-        if(H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, dblock) < 0)
-            H5E_THROW(H5E_CANTSET, "unable to add fixed array entry as child of array proxy")
-        dblock->top_proxy = hdr->top_proxy;
-    } /* end if */
-
-    /* Mark the header dirty (for updating statistics) */
-    *hdr_dirty = TRUE;
-
-    /* Set address of data block to return */
-    ret_value = dblock_addr;
+BEGIN_FUNC(PKG, ERR, haddr_t, HADDR_UNDEF, HADDR_UNDEF,
+           H5FA__dblock_create(H5FA_hdr_t *hdr, hbool_t *hdr_dirty))
+
+/* Local variables */
+H5FA_dblock_t *dblock = NULL;    /* Fixed array data block */
+haddr_t        dblock_addr;      /* Fixed array data block address */
+hbool_t        inserted = FALSE; /* Whether the header was inserted into cache */
+
+/* Sanity check */
+HDassert(hdr);
+HDassert(hdr_dirty);
+
+/* Allocate the data block */
+if (NULL == (dblock = H5FA__dblock_alloc(hdr)))
+    H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array data block")
+
+/* Set size of data block on disk */
+hdr->stats.dblk_size = dblock->size = H5FA_DBLOCK_SIZE(dblock);
+
+/* Allocate space for the data block on disk */
+if (HADDR_UNDEF == (dblock_addr = H5MF_alloc(hdr->f, H5FD_MEM_FARRAY_DBLOCK, (hsize_t)dblock->size)))
+    H5E_THROW(H5E_CANTALLOC, "file allocation failed for fixed array data block")
+dblock->addr = dblock_addr;
+
+/* Don't initialize elements if paged */
+if (!dblock->npages)
+    /* Clear any elements in data block to fill value */
+    if ((hdr->cparam.cls->fill)(dblock->elmts, (size_t)hdr->cparam.nelmts) < 0)
+        H5E_THROW(H5E_CANTSET, "can't set fixed array data block elements to class's fill value")
+
+/* Cache the new fixed array data block */
+if (H5AC_insert_entry(hdr->f, H5AC_FARRAY_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
+    H5E_THROW(H5E_CANTINSERT, "can't add fixed array data block to cache")
+inserted = TRUE;
+
+/* Add data block as child of 'top' proxy */
+if (hdr->top_proxy) {
+    if (H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, dblock) < 0)
+        H5E_THROW(H5E_CANTSET, "unable to add fixed array entry as child of array proxy")
+    dblock->top_proxy = hdr->top_proxy;
+} /* end if */
+
+/* Mark the header dirty (for updating statistics) */
+*hdr_dirty = TRUE;
+
+/* Set address of data block to return */
+ret_value = dblock_addr;
 
 CATCH
 
-    if(!H5F_addr_defined(ret_value))
-        if(dblock) {
-            /* Remove from cache, if inserted */
-            if(inserted)
-                if(H5AC_remove_entry(dblock) < 0)
-                    H5E_THROW(H5E_CANTREMOVE, "unable to remove fixed array data block from cache")
+if (!H5F_addr_defined(ret_value))
+    if (dblock) {
+        /* Remove from cache, if inserted */
+        if (inserted)
+            if (H5AC_remove_entry(dblock) < 0)
+                H5E_THROW(H5E_CANTREMOVE, "unable to remove fixed array data block from cache")
 
-            /* Release data block's disk space */
-            if(H5F_addr_defined(dblock->addr) && H5MF_xfree(hdr->f, H5FD_MEM_FARRAY_DBLOCK, dblock->addr, (hsize_t)dblock->size) < 0)
-                H5E_THROW(H5E_CANTFREE, "unable to release fixed array data block")
+        /* Release data block's disk space */
+        if (H5F_addr_defined(dblock->addr) &&
+            H5MF_xfree(hdr->f, H5FD_MEM_FARRAY_DBLOCK, dblock->addr, (hsize_t)dblock->size) < 0)
+            H5E_THROW(H5E_CANTFREE, "unable to release fixed array data block")
 
-            /* Destroy data block */
-            if(H5FA__dblock_dest(dblock) < 0)
-                H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block")
-        } /* end if */
+        /* Destroy data block */
+        if (H5FA__dblock_dest(dblock) < 0)
+            H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block")
+    } /* end if */
 
-END_FUNC(PKG)   /* end H5FA__dblock_create() */
+END_FUNC(PKG) /* end H5FA__dblock_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__dblock_protect
  *
@@ -264,51 +250,51 @@ END_FUNC(PKG)   /* end H5FA__dblock_create() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-H5FA_dblock_t *, NULL, NULL,
-H5FA__dblock_protect(H5FA_hdr_t *hdr, haddr_t dblk_addr, unsigned flags))
-
-    /* Local variables */
-    H5FA_dblock_t *dblock;              /* Fixed array data block */
-    H5FA_dblock_cache_ud_t udata;       /* Information needed for loading data block */
-
-    /* Sanity check */
-    HDassert(hdr);
-    HDassert(H5F_addr_defined(dblk_addr));
-
-    /* only the H5AC__READ_ONLY_FLAG flag is permitted */
-    HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
-
-    /* Set up user data */
-    udata.hdr = hdr;
-    udata.dblk_addr = dblk_addr;
-
-    /* Protect the data block */
-    if(NULL == (dblock = (H5FA_dblock_t *)H5AC_protect(hdr->f, H5AC_FARRAY_DBLOCK, dblk_addr, &udata, flags)))
-        H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array data block, address = %llu", (unsigned long long)dblk_addr)
-
-    /* Create top proxy, if it doesn't exist */
-    if(hdr->top_proxy && NULL == dblock->top_proxy) {
-        /* Add data block as child of 'top' proxy */
-        if(H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, dblock) < 0)
-            H5E_THROW(H5E_CANTSET, "unable to add fixed array entry as child of array proxy")
-        dblock->top_proxy = hdr->top_proxy;
-    } /* end if */
+BEGIN_FUNC(PKG, ERR, H5FA_dblock_t *, NULL, NULL,
+           H5FA__dblock_protect(H5FA_hdr_t *hdr, haddr_t dblk_addr, unsigned flags))
+
+/* Local variables */
+H5FA_dblock_t *        dblock; /* Fixed array data block */
+H5FA_dblock_cache_ud_t udata;  /* Information needed for loading data block */
+
+/* Sanity check */
+HDassert(hdr);
+HDassert(H5F_addr_defined(dblk_addr));
+
+/* only the H5AC__READ_ONLY_FLAG flag is permitted */
+HDassert((flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
+
+/* Set up user data */
+udata.hdr       = hdr;
+udata.dblk_addr = dblk_addr;
 
-    /* Set return value */
-    ret_value = dblock;
+/* Protect the data block */
+if (NULL == (dblock = (H5FA_dblock_t *)H5AC_protect(hdr->f, H5AC_FARRAY_DBLOCK, dblk_addr, &udata, flags)))
+    H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array data block, address = %llu",
+              (unsigned long long)dblk_addr)
+
+/* Create top proxy, if it doesn't exist */
+if (hdr->top_proxy && NULL == dblock->top_proxy) {
+    /* Add data block as child of 'top' proxy */
+    if (H5AC_proxy_entry_add_child(hdr->top_proxy, hdr->f, dblock) < 0)
+        H5E_THROW(H5E_CANTSET, "unable to add fixed array entry as child of array proxy")
+    dblock->top_proxy = hdr->top_proxy;
+} /* end if */
+
+/* Set return value */
+ret_value = dblock;
 
 CATCH
 
-    /* Clean up on error */
-    if(!ret_value)
-        /* Release the data block, if it was protected */
-        if(dblock && H5AC_unprotect(hdr->f, H5AC_FARRAY_DBLOCK, dblock->addr, dblock, H5AC__NO_FLAGS_SET) < 0)
-            H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect fixed array data block, address = %llu", (unsigned long long)dblock->addr)
+/* Clean up on error */
+if (!ret_value)
+    /* Release the data block, if it was protected */
+    if (dblock && H5AC_unprotect(hdr->f, H5AC_FARRAY_DBLOCK, dblock->addr, dblock, H5AC__NO_FLAGS_SET) < 0)
+        H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect fixed array data block, address = %llu",
+                  (unsigned long long)dblock->addr)
 
-END_FUNC(PKG)   /* end H5FA__dblock_protect() */
+END_FUNC(PKG) /* end H5FA__dblock_protect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__dblock_unprotect
  *
@@ -321,24 +307,23 @@ END_FUNC(PKG)   /* end H5FA__dblock_protect() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__dblock_unprotect(H5FA_dblock_t *dblock, unsigned cache_flags))
+BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL,
+           H5FA__dblock_unprotect(H5FA_dblock_t *dblock, unsigned cache_flags))
 
-    /* Local variables */
+/* Local variables */
 
-    /* Sanity check */
-    HDassert(dblock);
+/* Sanity check */
+HDassert(dblock);
 
-    /* Unprotect the data block */
-    if(H5AC_unprotect(dblock->hdr->f, H5AC_FARRAY_DBLOCK, dblock->addr, dblock, cache_flags) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect fixed array data block, address = %llu", (unsigned long long)dblock->addr)
+/* Unprotect the data block */
+if (H5AC_unprotect(dblock->hdr->f, H5AC_FARRAY_DBLOCK, dblock->addr, dblock, cache_flags) < 0)
+    H5E_THROW(H5E_CANTUNPROTECT, "unable to unprotect fixed array data block, address = %llu",
+              (unsigned long long)dblock->addr)
 
 CATCH
 
-END_FUNC(PKG)   /* end H5FA__dblock_unprotect() */
+END_FUNC(PKG) /* end H5FA__dblock_unprotect() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__dblock_delete
  *
@@ -351,50 +336,49 @@ END_FUNC(PKG)   /* end H5FA__dblock_unprotect() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__dblock_delete(H5FA_hdr_t *hdr, haddr_t dblk_addr))
+BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__dblock_delete(H5FA_hdr_t *hdr, haddr_t dblk_addr))
 
-    /* Local variables */
-    H5FA_dblock_t *dblock = NULL;       /* Pointer to data block */
+/* Local variables */
+H5FA_dblock_t *dblock = NULL; /* Pointer to data block */
 
-    /* Sanity check */
-    HDassert(hdr);
-    HDassert(H5F_addr_defined(dblk_addr));
+/* Sanity check */
+HDassert(hdr);
+HDassert(H5F_addr_defined(dblk_addr));
 
-    /* Protect data block */
-    if(NULL == (dblock = H5FA__dblock_protect(hdr, dblk_addr, H5AC__NO_FLAGS_SET)))
-        H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array data block, address = %llu", (unsigned long long)dblk_addr)
+/* Protect data block */
+if (NULL == (dblock = H5FA__dblock_protect(hdr, dblk_addr, H5AC__NO_FLAGS_SET)))
+    H5E_THROW(H5E_CANTPROTECT, "unable to protect fixed array data block, address = %llu",
+              (unsigned long long)dblk_addr)
 
-    /* Check if data block is paged */
-    if(dblock->npages) {
-        haddr_t dblk_page_addr;         /* Address of each data block page */
-        size_t u;                       /* Local index variable */
-
-        /* Set up initial state */
-        dblk_page_addr = dblk_addr + H5FA_DBLOCK_PREFIX_SIZE(dblock);
-
-        /* Iterate over pages in data block */
-        for(u = 0; u < dblock->npages; u++) {
-            /* Evict the data block page from the metadata cache */
-            /* (OK to call if it doesn't exist in the cache) */
-            if(H5AC_expunge_entry(hdr->f, H5AC_FARRAY_DBLK_PAGE, dblk_page_addr, H5AC__NO_FLAGS_SET) < 0)
-                H5E_THROW(H5E_CANTEXPUNGE, "unable to remove array data block page from metadata cache")
-
-            /* Advance to next page address */
-            dblk_page_addr += dblock->dblk_page_size;
-        } /* end for */
-    } /* end if */
+/* Check if data block is paged */
+if (dblock->npages) {
+    haddr_t dblk_page_addr; /* Address of each data block page */
+    size_t  u;              /* Local index variable */
+
+    /* Set up initial state */
+    dblk_page_addr = dblk_addr + H5FA_DBLOCK_PREFIX_SIZE(dblock);
+
+    /* Iterate over pages in data block */
+    for (u = 0; u < dblock->npages; u++) {
+        /* Evict the data block page from the metadata cache */
+        /* (OK to call if it doesn't exist in the cache) */
+        if (H5AC_expunge_entry(hdr->f, H5AC_FARRAY_DBLK_PAGE, dblk_page_addr, H5AC__NO_FLAGS_SET) < 0)
+            H5E_THROW(H5E_CANTEXPUNGE, "unable to remove array data block page from metadata cache")
+
+        /* Advance to next page address */
+        dblk_page_addr += dblock->dblk_page_size;
+    } /* end for */
+} /* end if */
 
 CATCH
 
-    /* Finished deleting data block in metadata cache */
-    if(dblock && H5FA__dblock_unprotect(dblock, H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array data block")
+/* Finished deleting data block in metadata cache */
+if (dblock &&
+    H5FA__dblock_unprotect(dblock, H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0)
+    H5E_THROW(H5E_CANTUNPROTECT, "unable to release fixed array data block")
 
-END_FUNC(PKG)   /* end H5FA__dblock_delete() */
+END_FUNC(PKG) /* end H5FA__dblock_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__dblock_dest
  *
@@ -407,43 +391,40 @@ END_FUNC(PKG)   /* end H5FA__dblock_delete() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__dblock_dest(H5FA_dblock_t *dblock))
-
-    /* Sanity check */
-    HDassert(dblock);
-
-    /* Check if shared header field has been initialized */
-    if(dblock->hdr) {
-        /* Check if we've got elements in the data block */
-        if(dblock->elmts && !dblock->npages) {
-            /* Free buffer for data block elements */
-            HDassert(dblock->hdr->cparam.nelmts > 0);
-            dblock->elmts = H5FL_BLK_FREE(chunk_elmts, dblock->elmts);
-        } /* end if */
-
-        /* Check if data block is paged */
-        if(dblock->npages) {
-            /* Free buffer for 'page init' bitmask, if there is one */
-            HDassert(dblock->dblk_page_init_size > 0);
-            if(dblock->dblk_page_init)
-                dblock->dblk_page_init = H5FL_BLK_FREE(fa_page_init, dblock->dblk_page_init);
-        } /* end if */
-
-        /* Decrement reference count on shared info */
-        if(H5FA__hdr_decr(dblock->hdr) < 0)
-            H5E_THROW(H5E_CANTDEC, "can't decrement reference count on shared array header")
-        dblock->hdr = NULL;
+BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__dblock_dest(H5FA_dblock_t *dblock))
+
+/* Sanity check */
+HDassert(dblock);
+
+/* Check if shared header field has been initialized */
+if (dblock->hdr) {
+    /* Check if we've got elements in the data block */
+    if (dblock->elmts && !dblock->npages) {
+        /* Free buffer for data block elements */
+        HDassert(dblock->hdr->cparam.nelmts > 0);
+        dblock->elmts = H5FL_BLK_FREE(chunk_elmts, dblock->elmts);
     } /* end if */
 
-    /* Sanity check */
-    HDassert(NULL == dblock->top_proxy);
+    /* Check if data block is paged */
+    if (dblock->npages) {
+        /* Free buffer for 'page init' bitmask, if there is one */
+        HDassert(dblock->dblk_page_init_size > 0);
+        if (dblock->dblk_page_init)
+            dblock->dblk_page_init = H5FL_BLK_FREE(fa_page_init, dblock->dblk_page_init);
+    } /* end if */
 
-    /* Free the data block itself */
-    dblock = H5FL_FREE(H5FA_dblock_t, dblock);
+    /* Decrement reference count on shared info */
+    if (H5FA__hdr_decr(dblock->hdr) < 0)
+        H5E_THROW(H5E_CANTDEC, "can't decrement reference count on shared array header")
+    dblock->hdr = NULL;
+} /* end if */
 
-CATCH
+/* Sanity check */
+HDassert(NULL == dblock->top_proxy);
 
-END_FUNC(PKG)   /* end H5FA__dblock_dest() */
+/* Free the data block itself */
+dblock = H5FL_FREE(H5FA_dblock_t, dblock);
+
+CATCH
 
+END_FUNC(PKG) /* end H5FA__dblock_dest() */