Formats the source and updates the gcc warning pragmas

1 files changed, 289 insertions, 324 deletions

diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c
index 122fbd1..290ede6 100644
--- a/src/H5Dfarray.c
+++ b/src/H5Dfarray.c
@@ -24,29 +24,29 @@
 /* Module Setup */
 /****************/
 
-#include "H5Dmodule.h"          /* This source code file is part of the H5D module */
-
+#include "H5Dmodule.h" /* This source code file is part of the H5D module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions            */
-#include "H5Dpkg.h"         /* Datasets                     */
-#include "H5Eprivate.h"     /* Error handling               */
-#include "H5FAprivate.h"    /* Fixed arrays                 */
-#include "H5FLprivate.h"    /* Free Lists                   */
-#include "H5MFprivate.h"    /* File space management        */
-#include "H5VMprivate.h"    /* Vector functions             */
-
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Dpkg.h"      /* Datasets                     */
+#include "H5Eprivate.h"  /* Error handling               */
+#include "H5FAprivate.h" /* Fixed arrays                 */
+#include "H5FLprivate.h" /* Free Lists                   */
+#include "H5MFprivate.h" /* File space management        */
+#include "H5VMprivate.h" /* Vector functions             */
 
 /****************/
 /* Local Macros */
 /****************/
 
 /* Value to fill unset array elements with */
-#define H5D_FARRAY_FILL         HADDR_UNDEF
-#define H5D_FARRAY_FILT_FILL    {HADDR_UNDEF, 0, 0}
-
+#define H5D_FARRAY_FILL HADDR_UNDEF
+#define H5D_FARRAY_FILT_FILL                                                                                 \
+    {                                                                                                        \
+        HADDR_UNDEF, 0, 0                                                                                    \
+    }
 
 /******************/
 /* Local Typedefs */
@@ -54,33 +54,32 @@
 
 /* Fixed array create/open user data */
 typedef struct H5D_farray_ctx_ud_t {
-    const H5F_t *f;             /* Pointer to file info */
-    uint32_t chunk_size;        /* Size of chunk (bytes) */
+    const H5F_t *f;          /* Pointer to file info */
+    uint32_t     chunk_size; /* Size of chunk (bytes) */
 } H5D_farray_ctx_ud_t;
 
 /* Fixed array callback context */
 typedef struct H5D_farray_ctx_t {
-    size_t file_addr_len;       /* Size of addresses in the file (bytes) */
-    size_t chunk_size_len;      /* Size of chunk sizes in the file (bytes) */
+    size_t file_addr_len;  /* Size of addresses in the file (bytes) */
+    size_t chunk_size_len; /* Size of chunk sizes in the file (bytes) */
 } H5D_farray_ctx_t;
 
 /* Fixed Array callback info for iteration over chunks */
 typedef struct H5D_farray_it_ud_t {
-    H5D_chunk_common_ud_t common;       /* Common info for Fixed Array user data (must be first) */
-    H5D_chunk_rec_t     chunk_rec;      /* Generic chunk record for callback */
-    hbool_t             filtered;       /* Whether the chunks are filtered */
-    H5D_chunk_cb_func_t cb;             /* Chunk callback routine */
-    void                *udata;         /* User data for chunk callback routine */
+    H5D_chunk_common_ud_t common;    /* Common info for Fixed Array user data (must be first) */
+    H5D_chunk_rec_t       chunk_rec; /* Generic chunk record for callback */
+    hbool_t               filtered;  /* Whether the chunks are filtered */
+    H5D_chunk_cb_func_t   cb;        /* Chunk callback routine */
+    void *                udata;     /* User data for chunk callback routine */
 } H5D_farray_it_ud_t;
 
 /* Native fixed array element for chunks w/filters */
 typedef struct H5D_farray_filt_elmt_t {
-    haddr_t addr;               /* Address of chunk */
-    uint32_t nbytes;            /* Size of chunk (in file) */
-    uint32_t filter_mask;       /* Excluded filters for chunk */
+    haddr_t  addr;        /* Address of chunk */
+    uint32_t nbytes;      /* Size of chunk (in file) */
+    uint32_t filter_mask; /* Excluded filters for chunk */
 } H5D_farray_filt_elmt_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -90,51 +89,42 @@ static int H5D__farray_idx_iterate_cb(hsize_t idx, const void *_elmt, void *_uda
 static int H5D__farray_idx_delete_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata);
 
 /* Fixed array class callbacks for chunks w/o filters */
-static void *H5D__farray_crt_context(void *udata);
+static void * H5D__farray_crt_context(void *udata);
 static herr_t H5D__farray_dst_context(void *ctx);
 static herr_t H5D__farray_fill(void *nat_blk, size_t nelmts);
-static herr_t H5D__farray_encode(void *raw, const void *elmt, size_t nelmts,
-    void *ctx);
-static herr_t H5D__farray_decode(const void *raw, void *elmt, size_t nelmts,
-    void *ctx);
-static herr_t H5D__farray_debug(FILE *stream, int indent, int fwidth,
-    hsize_t idx, const void *elmt);
-static void *H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr);
+static herr_t H5D__farray_encode(void *raw, const void *elmt, size_t nelmts, void *ctx);
+static herr_t H5D__farray_decode(const void *raw, void *elmt, size_t nelmts, void *ctx);
+static herr_t H5D__farray_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt);
+static void * H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr);
 static herr_t H5D__farray_dst_dbg_context(void *dbg_ctx);
 
 /* Fixed array class callbacks for chunks w/filters */
 /* (some shared with callbacks for chunks w/o filters) */
 static herr_t H5D__farray_filt_fill(void *nat_blk, size_t nelmts);
-static herr_t H5D__farray_filt_encode(void *raw, const void *elmt, size_t nelmts,
-    void *ctx);
-static herr_t H5D__farray_filt_decode(const void *raw, void *elmt, size_t nelmts,
-    void *ctx);
-static herr_t H5D__farray_filt_debug(FILE *stream, int indent, int fwidth,
-    hsize_t idx, const void *elmt);
+static herr_t H5D__farray_filt_encode(void *raw, const void *elmt, size_t nelmts, void *ctx);
+static herr_t H5D__farray_filt_decode(const void *raw, void *elmt, size_t nelmts, void *ctx);
+static herr_t H5D__farray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt);
 
 /* Chunked layout indexing callbacks */
-static herr_t H5D__farray_idx_init(const H5D_chk_idx_info_t *idx_info,
-    const H5S_t *space, haddr_t dset_ohdr_addr);
-static herr_t H5D__farray_idx_create(const H5D_chk_idx_info_t *idx_info);
+static herr_t  H5D__farray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t *space,
+                                    haddr_t dset_ohdr_addr);
+static herr_t  H5D__farray_idx_create(const H5D_chk_idx_info_t *idx_info);
 static hbool_t H5D__farray_idx_is_space_alloc(const H5O_storage_chunk_t *storage);
-static herr_t H5D__farray_idx_insert(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_ud_t *udata, const H5D_t *dset);
-static herr_t H5D__farray_idx_get_addr(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_ud_t *udata);
-static int H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_cb_func_t chunk_cb, void *chunk_udata);
-static herr_t H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_common_ud_t *udata);
-static herr_t H5D__farray_idx_delete(const H5D_chk_idx_info_t *idx_info);
-static herr_t H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
-    const H5D_chk_idx_info_t *idx_info_dst);
-static herr_t H5D__farray_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
-    H5O_storage_chunk_t *storage_dst);
-static herr_t H5D__farray_idx_size(const H5D_chk_idx_info_t *idx_info,
-    hsize_t *size);
-static herr_t H5D__farray_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr);
-static herr_t H5D__farray_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream);
-static herr_t H5D__farray_idx_dest(const H5D_chk_idx_info_t *idx_info);
+static herr_t  H5D__farray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata,
+                                      const H5D_t *dset);
+static herr_t  H5D__farray_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata);
+static int     H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chunk_cb,
+                                       void *chunk_udata);
+static herr_t  H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *udata);
+static herr_t  H5D__farray_idx_delete(const H5D_chk_idx_info_t *idx_info);
+static herr_t  H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
+                                          const H5D_chk_idx_info_t *idx_info_dst);
+static herr_t  H5D__farray_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
+                                             H5O_storage_chunk_t *storage_dst);
+static herr_t  H5D__farray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *size);
+static herr_t  H5D__farray_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr);
+static herr_t  H5D__farray_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream);
+static herr_t  H5D__farray_idx_dest(const H5D_chk_idx_info_t *idx_info);
 
 /* Generic fixed array routines */
 static herr_t H5D__farray_idx_open(const H5D_chk_idx_info_t *idx_info);
@@ -146,63 +136,61 @@ static herr_t H5D__farray_idx_depend(const H5D_chk_idx_info_t *idx_info);
 
 /* Fixed array indexed chunk I/O ops */
 const H5D_chunk_ops_t H5D_COPS_FARRAY[1] = {{
-    TRUE,                               /* Fixed array indices support SWMR access */
-    H5D__farray_idx_init,               /* init */
-    H5D__farray_idx_create,             /* create */
-    H5D__farray_idx_is_space_alloc,     /* is_space_alloc */
-    H5D__farray_idx_insert,             /* insert */
-    H5D__farray_idx_get_addr,           /* get_addr */
-    NULL,                               /* resize */
-    H5D__farray_idx_iterate,            /* iterate */
-    H5D__farray_idx_remove,             /* remove */
-    H5D__farray_idx_delete,             /* delete */
-    H5D__farray_idx_copy_setup,         /* copy_setup */
-    H5D__farray_idx_copy_shutdown,      /* copy_shutdown */
-    H5D__farray_idx_size,               /* size */
-    H5D__farray_idx_reset,              /* reset */
-    H5D__farray_idx_dump,               /* dump */
-    H5D__farray_idx_dest,               /* destroy */
-    H5D__farray_idx_dest                /* close (same as destroy) */
+    TRUE,                           /* Fixed array indices support SWMR access */
+    H5D__farray_idx_init,           /* init */
+    H5D__farray_idx_create,         /* create */
+    H5D__farray_idx_is_space_alloc, /* is_space_alloc */
+    H5D__farray_idx_insert,         /* insert */
+    H5D__farray_idx_get_addr,       /* get_addr */
+    NULL,                           /* resize */
+    H5D__farray_idx_iterate,        /* iterate */
+    H5D__farray_idx_remove,         /* remove */
+    H5D__farray_idx_delete,         /* delete */
+    H5D__farray_idx_copy_setup,     /* copy_setup */
+    H5D__farray_idx_copy_shutdown,  /* copy_shutdown */
+    H5D__farray_idx_size,           /* size */
+    H5D__farray_idx_reset,          /* reset */
+    H5D__farray_idx_dump,           /* dump */
+    H5D__farray_idx_dest,           /* destroy */
+    H5D__farray_idx_dest            /* close (same as destroy) */
 }};
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
 /* Fixed array class callbacks for dataset chunks w/o filters */
-const H5FA_class_t H5FA_CLS_CHUNK[1]={{
-    H5FA_CLS_CHUNK_ID,          /* Type of fixed array */
-    "Chunk w/o filters",        /* Name of fixed array class */
-    sizeof(haddr_t),            /* Size of native element */
-    H5D__farray_crt_context,    /* Create context */
-    H5D__farray_dst_context,    /* Destroy context */
-    H5D__farray_fill,           /* Fill block of missing elements callback */
-    H5D__farray_encode,         /* Element encoding callback */
-    H5D__farray_decode,         /* Element decoding callback */
-    H5D__farray_debug,          /* Element debugging callback */
+const H5FA_class_t H5FA_CLS_CHUNK[1] = {{
+    H5FA_CLS_CHUNK_ID,           /* Type of fixed array */
+    "Chunk w/o filters",         /* Name of fixed array class */
+    sizeof(haddr_t),             /* Size of native element */
+    H5D__farray_crt_context,     /* Create context */
+    H5D__farray_dst_context,     /* Destroy context */
+    H5D__farray_fill,            /* Fill block of missing elements callback */
+    H5D__farray_encode,          /* Element encoding callback */
+    H5D__farray_decode,          /* Element decoding callback */
+    H5D__farray_debug,           /* Element debugging callback */
     H5D__farray_crt_dbg_context, /* Create debugging context */
-    H5D__farray_dst_dbg_context /* Destroy debugging context */
+    H5D__farray_dst_dbg_context  /* Destroy debugging context */
 }};
 
 /* Fixed array class callbacks for dataset chunks w/filters */
-const H5FA_class_t H5FA_CLS_FILT_CHUNK[1]={{
-    H5FA_CLS_FILT_CHUNK_ID,     /* Type of fixed array */
-    "Chunk w/filters",          /* Name of fixed array class */
+const H5FA_class_t H5FA_CLS_FILT_CHUNK[1] = {{
+    H5FA_CLS_FILT_CHUNK_ID,         /* Type of fixed array */
+    "Chunk w/filters",              /* Name of fixed array class */
     sizeof(H5D_farray_filt_elmt_t), /* Size of native element */
-    H5D__farray_crt_context,    /* Create context */
-    H5D__farray_dst_context,    /* Destroy context */
-    H5D__farray_filt_fill,      /* Fill block of missing elements callback */
-    H5D__farray_filt_encode,    /* Element encoding callback */
-    H5D__farray_filt_decode,    /* Element decoding callback */
-    H5D__farray_filt_debug,     /* Element debugging callback */
-    H5D__farray_crt_dbg_context, /* Create debugging context */
-    H5D__farray_dst_dbg_context /* Destroy debugging context */
+    H5D__farray_crt_context,        /* Create context */
+    H5D__farray_dst_context,        /* Destroy context */
+    H5D__farray_filt_fill,          /* Fill block of missing elements callback */
+    H5D__farray_filt_encode,        /* Element encoding callback */
+    H5D__farray_filt_decode,        /* Element decoding callback */
+    H5D__farray_filt_debug,         /* Element debugging callback */
+    H5D__farray_crt_dbg_context,    /* Create debugging context */
+    H5D__farray_dst_dbg_context     /* Destroy debugging context */
 }};
 
 /* Declare a free list to manage the H5D_farray_ctx_t struct */
@@ -211,7 +199,6 @@ H5FL_DEFINE_STATIC(H5D_farray_ctx_t);
 /* Declare a free list to manage the H5D_farray_ctx_ud_t struct */
 H5FL_DEFINE_STATIC(H5D_farray_ctx_ud_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_crt_context
  *
@@ -228,9 +215,9 @@ H5FL_DEFINE_STATIC(H5D_farray_ctx_ud_t);
 static void *
 H5D__farray_crt_context(void *_udata)
 {
-    H5D_farray_ctx_t *ctx;      /* Fixed array callback context */
-    H5D_farray_ctx_ud_t *udata = (H5D_farray_ctx_ud_t *)_udata; /* User data for fixed array context */
-    void *ret_value = NULL;     /* Return value */
+    H5D_farray_ctx_t *   ctx;                                       /* Fixed array callback context */
+    H5D_farray_ctx_ud_t *udata     = (H5D_farray_ctx_ud_t *)_udata; /* User data for fixed array context */
+    void *               ret_value = NULL;                          /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -240,17 +227,17 @@ H5D__farray_crt_context(void *_udata)
     HDassert(udata->chunk_size > 0);
 
     /* Allocate new context structure */
-    if(NULL == (ctx = H5FL_MALLOC(H5D_farray_ctx_t)))
+    if (NULL == (ctx = H5FL_MALLOC(H5D_farray_ctx_t)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, NULL, "can't allocate fixed array client callback context")
 
-     /* Initialize the context */
+    /* Initialize the context */
     ctx->file_addr_len = H5F_SIZEOF_ADDR(udata->f);
 
     /* Compute the size required for encoding the size of a chunk, allowing
      *      for an extra byte, in case the filter makes the chunk larger.
      */
     ctx->chunk_size_len = 1 + ((H5VM_log2_gen((uint64_t)udata->chunk_size) + 8) / 8);
-    if(ctx->chunk_size_len > 8)
+    if (ctx->chunk_size_len > 8)
         ctx->chunk_size_len = 8;
 
     /* Set return value */
@@ -260,7 +247,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_crt_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_dst_context
  *
@@ -277,7 +263,7 @@ done:
 static herr_t
 H5D__farray_dst_context(void *_ctx)
 {
-    H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx;   /* Fixed array callback context */
+    H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -290,7 +276,6 @@ H5D__farray_dst_context(void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_dst_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_fill
  *
@@ -307,7 +292,7 @@ H5D__farray_dst_context(void *_ctx)
 static herr_t
 H5D__farray_fill(void *nat_blk, size_t nelmts)
 {
-    haddr_t fill_val = H5D_FARRAY_FILL;          /* Value to fill elements with */
+    haddr_t fill_val = H5D_FARRAY_FILL; /* Value to fill elements with */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -320,7 +305,6 @@ H5D__farray_fill(void *nat_blk, size_t nelmts)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_fill() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_encode
  *
@@ -337,8 +321,8 @@ H5D__farray_fill(void *nat_blk, size_t nelmts)
 static herr_t
 H5D__farray_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx)
 {
-    H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx;   /* Fixed array callback context */
-    const haddr_t *elmt = (const haddr_t *)_elmt;     /* Convenience pointer to native elements */
+    H5D_farray_ctx_t *ctx  = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */
+    const haddr_t *   elmt = (const haddr_t *)_elmt;   /* Convenience pointer to native elements */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -349,7 +333,7 @@ H5D__farray_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx)
     HDassert(ctx);
 
     /* Encode native elements into raw elements */
-    while(nelmts) {
+    while (nelmts) {
         /* Encode element */
         /* (advances 'raw' pointer) */
         H5F_addr_encode_len(ctx->file_addr_len, (uint8_t **)&raw, *elmt);
@@ -364,7 +348,6 @@ H5D__farray_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_decode
  *
@@ -381,9 +364,9 @@ H5D__farray_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx)
 static herr_t
 H5D__farray_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx)
 {
-    H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx;   /* Fixed array callback context */
-    haddr_t *elmt = (haddr_t *)_elmt;           /* Convenience pointer to native elements */
-    const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */
+    H5D_farray_ctx_t *ctx  = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */
+    haddr_t *         elmt = (haddr_t *)_elmt;         /* Convenience pointer to native elements */
+    const uint8_t *   raw  = (const uint8_t *)_raw;    /* Convenience pointer to raw elements */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -393,7 +376,7 @@ H5D__farray_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx)
     HDassert(nelmts);
 
     /* Decode raw elements into native elements */
-    while(nelmts) {
+    while (nelmts) {
         /* Decode element */
         /* (advances 'raw' pointer) */
         H5F_addr_decode_len(ctx->file_addr_len, &raw, elmt);
@@ -408,7 +391,6 @@ H5D__farray_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_debug
  *
@@ -423,10 +405,9 @@ H5D__farray_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__farray_debug(FILE *stream, int indent, int fwidth, hsize_t idx,
-    const void *elmt)
+H5D__farray_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt)
 {
-    char temp_str[128];     /* Temporary string, for formatting */
+    char temp_str[128]; /* Temporary string, for formatting */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -436,13 +417,11 @@ H5D__farray_debug(FILE *stream, int indent, int fwidth, hsize_t idx,
 
     /* Print element */
     HDsprintf(temp_str, "Element #%llu:", (unsigned long long)idx);
-    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, temp_str,
-        *(const haddr_t *)elmt);
+    HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth, temp_str, *(const haddr_t *)elmt);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_crt_dbg_context
  *
@@ -460,11 +439,11 @@ H5D__farray_debug(FILE *stream, int indent, int fwidth, hsize_t idx,
 static void *
 H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr)
 {
-    H5D_farray_ctx_ud_t     *dbg_ctx = NULL;   /* Context for fixed array callback */
-    H5O_loc_t obj_loc;          /* Pointer to an object's location */
-    hbool_t obj_opened = FALSE; /* Flag to indicate that the object header was opened */
-    H5O_layout_t layout;        /* Layout message */
-    void *ret_value = NULL;     /* Return value */
+    H5D_farray_ctx_ud_t *dbg_ctx = NULL;     /* Context for fixed array callback */
+    H5O_loc_t            obj_loc;            /* Pointer to an object's location */
+    hbool_t              obj_opened = FALSE; /* Flag to indicate that the object header was opened */
+    H5O_layout_t         layout;             /* Layout message */
+    void *               ret_value = NULL;   /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -473,7 +452,7 @@ H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr)
     HDassert(H5F_addr_defined(obj_addr));
 
     /* Allocate context for debugging callback */
-    if(NULL == (dbg_ctx = H5FL_MALLOC(H5D_farray_ctx_ud_t)))
+    if (NULL == (dbg_ctx = H5FL_MALLOC(H5D_farray_ctx_ud_t)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, NULL, "can't allocate fixed array client callback context")
 
     /* Set up the object header location info */
@@ -482,20 +461,20 @@ H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr)
     obj_loc.addr = obj_addr;
 
     /* Open the object header where the layout message resides */
-    if(H5O_open(&obj_loc) < 0)
+    if (H5O_open(&obj_loc) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, NULL, "can't open object header")
     obj_opened = TRUE;
 
     /* Read the layout message */
-    if(NULL == H5O_msg_read(&obj_loc, H5O_LAYOUT_ID, &layout))
+    if (NULL == H5O_msg_read(&obj_loc, H5O_LAYOUT_ID, &layout))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "can't get layout info")
 
     /* close the object header */
-    if(H5O_close(&obj_loc, NULL) < 0)
+    if (H5O_close(&obj_loc, NULL) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, NULL, "can't close object header")
 
     /* Create user data */
-    dbg_ctx->f = f;
+    dbg_ctx->f          = f;
     dbg_ctx->chunk_size = layout.u.chunk.size;
 
     /* Set return value */
@@ -503,21 +482,20 @@ H5D__farray_crt_dbg_context(H5F_t *f, haddr_t obj_addr)
 
 done:
     /* Cleanup on error */
-    if(ret_value == NULL) {
+    if (ret_value == NULL) {
         /* Release context structure */
-        if(dbg_ctx)
+        if (dbg_ctx)
             dbg_ctx = H5FL_FREE(H5D_farray_ctx_ud_t, dbg_ctx);
 
         /* Close object header */
-        if(obj_opened)
-            if(H5O_close(&obj_loc, NULL) < 0)
+        if (obj_opened)
+            if (H5O_close(&obj_loc, NULL) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, NULL, "can't close object header")
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_crt_dbg_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_dst_dbg_context
  *
@@ -548,7 +526,6 @@ H5D__farray_dst_dbg_context(void *_dbg_ctx)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_dst_dbg_context() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_filt_fill
  *
@@ -565,7 +542,7 @@ H5D__farray_dst_dbg_context(void *_dbg_ctx)
 static herr_t
 H5D__farray_filt_fill(void *nat_blk, size_t nelmts)
 {
-    H5D_farray_filt_elmt_t fill_val = H5D_FARRAY_FILT_FILL;     /* Value to fill elements with */
+    H5D_farray_filt_elmt_t fill_val = H5D_FARRAY_FILT_FILL; /* Value to fill elements with */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -579,7 +556,6 @@ H5D__farray_filt_fill(void *nat_blk, size_t nelmts)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_filt_fill() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_filt_encode
  *
@@ -596,9 +572,10 @@ H5D__farray_filt_fill(void *nat_blk, size_t nelmts)
 static herr_t
 H5D__farray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx)
 {
-    H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx;   /* Fixed array callback context */
-    uint8_t *raw = (uint8_t *)_raw;             /* Convenience pointer to raw elements */
-    const H5D_farray_filt_elmt_t *elmt = (const H5D_farray_filt_elmt_t *)_elmt;     /* Convenience pointer to native elements */
+    H5D_farray_ctx_t *            ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */
+    uint8_t *                     raw = (uint8_t *)_raw;          /* Convenience pointer to raw elements */
+    const H5D_farray_filt_elmt_t *elmt =
+        (const H5D_farray_filt_elmt_t *)_elmt; /* Convenience pointer to native elements */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -609,7 +586,7 @@ H5D__farray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx
     HDassert(ctx);
 
     /* Encode native elements into raw elements */
-    while(nelmts) {
+    while (nelmts) {
         /* Encode element */
         /* (advances 'raw' pointer) */
         H5F_addr_encode_len(ctx->file_addr_len, &raw, elmt->addr);
@@ -626,7 +603,6 @@ H5D__farray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_filt_encode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_filt_decode
  *
@@ -643,8 +619,9 @@ H5D__farray_filt_encode(void *_raw, const void *_elmt, size_t nelmts, void *_ctx
 static herr_t
 H5D__farray_filt_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx)
 {
-    H5D_farray_ctx_t *ctx = (H5D_farray_ctx_t *)_ctx;   /* Fixed array callback context */
-    H5D_farray_filt_elmt_t *elmt = (H5D_farray_filt_elmt_t *)_elmt;           /* Convenience pointer to native elements */
+    H5D_farray_ctx_t *      ctx = (H5D_farray_ctx_t *)_ctx; /* Fixed array callback context */
+    H5D_farray_filt_elmt_t *elmt =
+        (H5D_farray_filt_elmt_t *)_elmt;        /* Convenience pointer to native elements */
     const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */
 
     FUNC_ENTER_STATIC_NOERR
@@ -655,7 +632,7 @@ H5D__farray_filt_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx
     HDassert(nelmts);
 
     /* Decode raw elements into native elements */
-    while(nelmts) {
+    while (nelmts) {
         /* Decode element */
         /* (advances 'raw' pointer) */
         H5F_addr_decode_len(ctx->file_addr_len, &raw, &elmt->addr);
@@ -672,7 +649,6 @@ H5D__farray_filt_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_filt_decode() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_filt_debug
  *
@@ -687,11 +663,11 @@ H5D__farray_filt_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__farray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx,
-    const void *_elmt)
+H5D__farray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *_elmt)
 {
-    const H5D_farray_filt_elmt_t *elmt = (const H5D_farray_filt_elmt_t *)_elmt;           /* Convenience pointer to native elements */
-    char temp_str[128];     /* Temporary string, for formatting */
+    const H5D_farray_filt_elmt_t *elmt =
+        (const H5D_farray_filt_elmt_t *)_elmt; /* Convenience pointer to native elements */
+    char temp_str[128];                        /* Temporary string, for formatting */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -701,13 +677,12 @@ H5D__farray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx,
 
     /* Print element */
     HDsprintf(temp_str, "Element #%llu:", (unsigned long long)idx);
-    HDfprintf(stream, "%*s%-*s {%a, %u, %0x}\n", indent, "", fwidth, temp_str,
-        elmt->addr, elmt->nbytes, elmt->filter_mask);
+    HDfprintf(stream, "%*s%-*s {%a, %u, %0x}\n", indent, "", fwidth, temp_str, elmt->addr, elmt->nbytes,
+              elmt->filter_mask);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_filt_debug() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_depend
  *
@@ -725,10 +700,10 @@ H5D__farray_filt_debug(FILE *stream, int indent, int fwidth, hsize_t idx,
 static herr_t
 H5D__farray_idx_depend(const H5D_chk_idx_info_t *idx_info)
 {
-    H5O_t *oh = NULL;                   /* Object header */
-    H5O_loc_t oloc;                     /* Temporary object header location for dataset */
-    H5AC_proxy_entry_t *oh_proxy;       /* Dataset's object header proxy */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5O_t *             oh = NULL;           /* Object header */
+    H5O_loc_t           oloc;                /* Temporary object header location for dataset */
+    H5AC_proxy_entry_t *oh_proxy;            /* Dataset's object header proxy */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -750,26 +725,26 @@ H5D__farray_idx_depend(const H5D_chk_idx_info_t *idx_info)
     oloc.addr = idx_info->storage->u.farray.dset_ohdr_addr;
 
     /* Get header */
-    if(NULL == (oh = H5O_protect(&oloc, H5AC__READ_ONLY_FLAG, TRUE)))
+    if (NULL == (oh = H5O_protect(&oloc, H5AC__READ_ONLY_FLAG, TRUE)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Retrieve the dataset's object header proxy */
-    if(NULL == (oh_proxy = H5O_get_proxy(oh)))
+    if (NULL == (oh_proxy = H5O_get_proxy(oh)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "unable to get dataset object header proxy")
 
     /* Make the fixed array a child flush dependency of the dataset's object header proxy */
-    if(H5FA_depend(idx_info->storage->u.farray.fa, oh_proxy) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTDEPEND, FAIL, "unable to create flush dependency on object header proxy")
+    if (H5FA_depend(idx_info->storage->u.farray.fa, oh_proxy) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTDEPEND, FAIL,
+                    "unable to create flush dependency on object header proxy")
 
 done:
     /* Release the object header from the cache */
-    if(oh && H5O_unprotect(&oloc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(&oloc, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_depend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_init
  *
@@ -783,7 +758,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__farray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNUSED *space, haddr_t dset_ohdr_addr)
+H5D__farray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNUSED *space,
+                     haddr_t dset_ohdr_addr)
 {
     FUNC_ENTER_STATIC_NOERR
 
@@ -797,7 +773,6 @@ H5D__farray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNU
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_idx_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_open
  *
@@ -815,8 +790,8 @@ H5D__farray_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t H5_ATTR_UNU
 static herr_t
 H5D__farray_idx_open(const H5D_chk_idx_info_t *idx_info)
 {
-    H5D_farray_ctx_ud_t udata;          /* User data for fixed array open call */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_farray_ctx_ud_t udata;               /* User data for fixed array open call */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -832,23 +807,24 @@ H5D__farray_idx_open(const H5D_chk_idx_info_t *idx_info)
     HDassert(NULL == idx_info->storage->u.farray.fa);
 
     /* Set up the user data */
-    udata.f = idx_info->f;
+    udata.f          = idx_info->f;
     udata.chunk_size = idx_info->layout->size;
 
     /* Open the fixed array for the chunk index */
-    if(NULL == (idx_info->storage->u.farray.fa = H5FA_open(idx_info->f, idx_info->storage->idx_addr, &udata)))
+    if (NULL ==
+        (idx_info->storage->u.farray.fa = H5FA_open(idx_info->f, idx_info->storage->idx_addr, &udata)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't open fixed array")
 
-     /* Check for SWMR writes to the file */
-    if(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)
-        if(H5D__farray_idx_depend(idx_info) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTDEPEND, FAIL, "unable to create flush dependency on object header")
+    /* Check for SWMR writes to the file */
+    if (H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)
+        if (H5D__farray_idx_depend(idx_info) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTDEPEND, FAIL,
+                        "unable to create flush dependency on object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_create
  *
@@ -870,9 +846,9 @@ done:
 static herr_t
 H5D__farray_idx_create(const H5D_chk_idx_info_t *idx_info)
 {
-    H5FA_create_t     cparam; /* Fixed array creation parameters */
-    H5D_farray_ctx_ud_t udata;  /* User data for fixed array create call */
-    herr_t     ret_value = SUCCEED;     /* Return value */
+    H5FA_create_t       cparam;              /* Fixed array creation parameters */
+    H5D_farray_ctx_ud_t udata;               /* User data for fixed array create call */
+    herr_t              ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -887,21 +863,21 @@ H5D__farray_idx_create(const H5D_chk_idx_info_t *idx_info)
     HDassert(idx_info->layout->nchunks);
 
     /* General parameters */
-    if(idx_info->pline->nused > 0) {
-        unsigned chunk_size_len;        /* Size of encoded chunk size */
+    if (idx_info->pline->nused > 0) {
+        unsigned chunk_size_len; /* Size of encoded chunk size */
 
         /* Compute the size required for encoding the size of a chunk, allowing
          *      for an extra byte, in case the filter makes the chunk larger.
          */
         chunk_size_len = 1 + ((H5VM_log2_gen((uint64_t)idx_info->layout->size) + 8) / 8);
-        if(chunk_size_len > 8)
+        if (chunk_size_len > 8)
             chunk_size_len = 8;
 
-        cparam.cls = H5FA_CLS_FILT_CHUNK;
+        cparam.cls           = H5FA_CLS_FILT_CHUNK;
         cparam.raw_elmt_size = (uint8_t)(H5F_SIZEOF_ADDR(idx_info->f) + chunk_size_len + 4);
     } /* end if */
     else {
-        cparam.cls = H5FA_CLS_CHUNK;
+        cparam.cls           = H5FA_CLS_CHUNK;
         cparam.raw_elmt_size = (uint8_t)H5F_SIZEOF_ADDR(idx_info->f);
     } /* end else */
     cparam.max_dblk_page_nelmts_bits = idx_info->layout->u.farray.cparam.max_dblk_page_nelmts_bits;
@@ -909,27 +885,27 @@ H5D__farray_idx_create(const H5D_chk_idx_info_t *idx_info)
     cparam.nelmts = idx_info->layout->max_nchunks;
 
     /* Set up the user data */
-    udata.f = idx_info->f;
+    udata.f          = idx_info->f;
     udata.chunk_size = idx_info->layout->size;
 
     /* Create the fixed array for the chunk index */
-    if(NULL == (idx_info->storage->u.farray.fa = H5FA_create(idx_info->f, &cparam, &udata)))
+    if (NULL == (idx_info->storage->u.farray.fa = H5FA_create(idx_info->f, &cparam, &udata)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create fixed array")
 
     /* Get the address of the fixed array in file */
-    if(H5FA_get_addr(idx_info->storage->u.farray.fa, &(idx_info->storage->idx_addr)) < 0)
+    if (H5FA_get_addr(idx_info->storage->u.farray.fa, &(idx_info->storage->idx_addr)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query fixed array address")
 
     /* Check for SWMR writes to the file */
-    if(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)
-        if(H5D__farray_idx_depend(idx_info) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTDEPEND, FAIL, "unable to create flush dependency on object header")
+    if (H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)
+        if (H5D__farray_idx_depend(idx_info) < 0)
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTDEPEND, FAIL,
+                        "unable to create flush dependency on object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_create() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_is_space_alloc
  *
@@ -953,7 +929,6 @@ H5D__farray_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
     FUNC_LEAVE_NOAPI((hbool_t)H5F_addr_defined(storage->idx_addr))
 } /* end H5D__farray_idx_is_space_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_insert
  *
@@ -967,10 +942,10 @@ H5D__farray_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
  */
 static herr_t
 H5D__farray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata,
-    const H5D_t H5_ATTR_UNUSED *dset)
+                       const H5D_t H5_ATTR_UNUSED *dset)
 {
-    H5FA_t      *fa;      /* Pointer to fixed array structure */
-    herr_t      ret_value = SUCCEED;        /* Return value */
+    H5FA_t *fa;                  /* Pointer to fixed array structure */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -984,36 +959,37 @@ H5D__farray_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata
     HDassert(udata);
 
     /* Check if the fixed array is open yet */
-    if(NULL == idx_info->storage->u.farray.fa) {
+    if (NULL == idx_info->storage->u.farray.fa) {
         /* Open the fixed array in file */
-        if(H5D__farray_idx_open(idx_info) < 0)
+        if (H5D__farray_idx_open(idx_info) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array")
-    } else  /* Patch the top level file pointer contained in fa if needed */
+    }
+    else /* Patch the top level file pointer contained in fa if needed */
         H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f);
 
     /* Set convenience pointer to fixed array structure */
     fa = idx_info->storage->u.farray.fa;
 
-    if(!H5F_addr_defined(udata->chunk_block.offset))
+    if (!H5F_addr_defined(udata->chunk_block.offset))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTALLOC, FAIL, "The chunk should have allocated already")
-    if(udata->chunk_idx != (udata->chunk_idx & 0xffffffff)) /* negative value */
+    if (udata->chunk_idx != (udata->chunk_idx & 0xffffffff)) /* negative value */
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "chunk index must be less than 2^32")
 
     /* Check for filters on chunks */
-    if(idx_info->pline->nused > 0) {
-        H5D_farray_filt_elmt_t elmt;            /* Fixed array element */
+    if (idx_info->pline->nused > 0) {
+        H5D_farray_filt_elmt_t elmt; /* Fixed array element */
 
         elmt.addr = udata->chunk_block.offset;
         H5_CHECKED_ASSIGN(elmt.nbytes, uint32_t, udata->chunk_block.length, hsize_t);
         elmt.filter_mask = udata->filter_mask;
 
         /* Set the info for the chunk */
-        if(H5FA_set(fa, udata->chunk_idx, &elmt) < 0)
+        if (H5FA_set(fa, udata->chunk_idx, &elmt) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set chunk info")
     } /* end if */
     else {
         /* Set the address for the chunk */
-        if(H5FA_set(fa, udata->chunk_idx, &udata->chunk_block.offset) < 0)
+        if (H5FA_set(fa, udata->chunk_idx, &udata->chunk_block.offset) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "can't set chunk address")
     } /* end else */
 
@@ -1021,7 +997,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__farray_idx_insert() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_get_addr
  *
@@ -1039,9 +1014,9 @@ done:
 static herr_t
 H5D__farray_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata)
 {
-    H5FA_t      *fa;      /* Pointer to fixed array structure */
-    hsize_t     idx;       /* Array index of chunk */
-    herr_t    ret_value = SUCCEED;        /* Return value */
+    H5FA_t *fa;                  /* Pointer to fixed array structure */
+    hsize_t idx;                 /* Array index of chunk */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1055,52 +1030,53 @@ H5D__farray_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *uda
     HDassert(udata);
 
     /* Check if the fixed array is open yet */
-    if(NULL == idx_info->storage->u.farray.fa) {
+    if (NULL == idx_info->storage->u.farray.fa) {
         /* Open the fixed array in file */
-        if(H5D__farray_idx_open(idx_info) < 0)
+        if (H5D__farray_idx_open(idx_info) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array")
-    } else  /* Patch the top level file pointer contained in fa if needed */
+    }
+    else /* Patch the top level file pointer contained in fa if needed */
         H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f);
 
     /* Set convenience pointer to fixed array structure */
     fa = idx_info->storage->u.farray.fa;
 
     /* Calculate the index of this chunk */
-    idx = H5VM_array_offset_pre((idx_info->layout->ndims - 1), idx_info->layout->max_down_chunks, udata->common.scaled);
+    idx = H5VM_array_offset_pre((idx_info->layout->ndims - 1), idx_info->layout->max_down_chunks,
+                                udata->common.scaled);
 
     udata->chunk_idx = idx;
 
     /* Check for filters on chunks */
-    if(idx_info->pline->nused > 0) {
-        H5D_farray_filt_elmt_t elmt;            /* Fixed array element */
+    if (idx_info->pline->nused > 0) {
+        H5D_farray_filt_elmt_t elmt; /* Fixed array element */
 
         /* Get the information for the chunk */
-        if(H5FA_get(fa, idx, &elmt) < 0)
+        if (H5FA_get(fa, idx, &elmt) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk info")
 
         /* Set the info for the chunk */
         udata->chunk_block.offset = elmt.addr;
         udata->chunk_block.length = elmt.nbytes;
-        udata->filter_mask = elmt.filter_mask;
+        udata->filter_mask        = elmt.filter_mask;
     } /* end if */
     else {
         /* Get the address for the chunk */
-        if(H5FA_get(fa, idx, &udata->chunk_block.offset) < 0)
+        if (H5FA_get(fa, idx, &udata->chunk_block.offset) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address")
 
         /* Update the other (constant) information for the chunk */
         udata->chunk_block.length = idx_info->layout->size;
-        udata->filter_mask = 0;
+        udata->filter_mask        = 0;
     } /* end else */
 
-    if(!H5F_addr_defined(udata->chunk_block.offset))
+    if (!H5F_addr_defined(udata->chunk_block.offset))
         udata->chunk_block.length = 0;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__farray_idx_get_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_iterate_cb
  *
@@ -1116,39 +1092,39 @@ done:
 static int
 H5D__farray_idx_iterate_cb(hsize_t H5_ATTR_UNUSED idx, const void *_elmt, void *_udata)
 {
-    H5D_farray_it_ud_t   *udata = (H5D_farray_it_ud_t *)_udata; /* User data */
-    unsigned ndims;                 /* Rank of chunk */
-    int curr_dim;                   /* Current dimension */
-    int ret_value = H5_ITER_CONT;   /* Return value */
+    H5D_farray_it_ud_t *udata = (H5D_farray_it_ud_t *)_udata; /* User data */
+    unsigned            ndims;                                /* Rank of chunk */
+    int                 curr_dim;                             /* Current dimension */
+    int                 ret_value = H5_ITER_CONT;             /* Return value */
 
     FUNC_ENTER_STATIC_NOERR
 
     /* Compose generic chunk record for callback */
-    if(udata->filtered) {
+    if (udata->filtered) {
         const H5D_farray_filt_elmt_t *filt_elmt = (const H5D_farray_filt_elmt_t *)_elmt;
 
-        udata->chunk_rec.chunk_addr = filt_elmt->addr;
-        udata->chunk_rec.nbytes = filt_elmt->nbytes;
+        udata->chunk_rec.chunk_addr  = filt_elmt->addr;
+        udata->chunk_rec.nbytes      = filt_elmt->nbytes;
         udata->chunk_rec.filter_mask = filt_elmt->filter_mask;
     } /* end if */
     else
         udata->chunk_rec.chunk_addr = *(const haddr_t *)_elmt;
 
     /* Make "generic chunk" callback */
-    if(H5F_addr_defined(udata->chunk_rec.chunk_addr))
-        if((ret_value = (udata->cb)(&udata->chunk_rec, udata->udata)) < 0)
+    if (H5F_addr_defined(udata->chunk_rec.chunk_addr))
+        if ((ret_value = (udata->cb)(&udata->chunk_rec, udata->udata)) < 0)
             HERROR(H5E_DATASET, H5E_CALLBACK, "failure in generic chunk iterator callback");
 
     /* Update coordinates of chunk in dataset */
     ndims = udata->common.layout->ndims - 1;
     HDassert(ndims > 0);
     curr_dim = (int)(ndims - 1);
-    while(curr_dim >= 0) {
+    while (curr_dim >= 0) {
         /* Increment coordinate in current dimension */
         udata->chunk_rec.scaled[curr_dim]++;
 
         /* Check if we went off the end of the current dimension */
-        if(udata->chunk_rec.scaled[curr_dim] >= udata->common.layout->max_chunks[curr_dim]) {
+        if (udata->chunk_rec.scaled[curr_dim] >= udata->common.layout->max_chunks[curr_dim]) {
             /* Reset coordinate & move to next faster dimension */
             udata->chunk_rec.scaled[curr_dim] = 0;
             curr_dim--;
@@ -1160,7 +1136,6 @@ H5D__farray_idx_iterate_cb(hsize_t H5_ATTR_UNUSED idx, const void *_elmt, void *
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__farray_idx_iterate_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_iterate
  *
@@ -1175,12 +1150,11 @@ H5D__farray_idx_iterate_cb(hsize_t H5_ATTR_UNUSED idx, const void *_elmt, void *
  *-------------------------------------------------------------------------
  */
 static int
-H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info,
-    H5D_chunk_cb_func_t chunk_cb, void *chunk_udata)
+H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t chunk_cb, void *chunk_udata)
 {
-    H5FA_t      *fa;            /* Pointer to fixed array structure */
-    H5FA_stat_t fa_stat;        /* Fixed array statistics */
-    int ret_value = FAIL;       /* Return value */
+    H5FA_t *    fa;               /* Pointer to fixed array structure */
+    H5FA_stat_t fa_stat;          /* Fixed array statistics */
+    int         ret_value = FAIL; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1195,39 +1169,40 @@ H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info,
     HDassert(chunk_udata);
 
     /* Check if the fixed array is open yet */
-    if(NULL == idx_info->storage->u.farray.fa) {
+    if (NULL == idx_info->storage->u.farray.fa) {
         /* Open the fixed array in file */
-        if(H5D__farray_idx_open(idx_info) < 0)
+        if (H5D__farray_idx_open(idx_info) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array")
-    } else  /* Patch the top level file pointer contained in fa if needed */
+    }
+    else /* Patch the top level file pointer contained in fa if needed */
         H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f);
 
     /* Set convenience pointer to fixed array structure */
     fa = idx_info->storage->u.farray.fa;
 
     /* Get the fixed array statistics */
-    if(H5FA_get_stats(fa, &fa_stat) < 0)
+    if (H5FA_get_stats(fa, &fa_stat) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query fixed array statistics")
 
     /* Check if there are any array elements */
-    if(fa_stat.nelmts > 0) {
-        H5D_farray_it_ud_t udata;   /* User data for iteration callback */
+    if (fa_stat.nelmts > 0) {
+        H5D_farray_it_ud_t udata; /* User data for iteration callback */
 
         /* Initialize userdata */
         HDmemset(&udata, 0, sizeof udata);
-        udata.common.layout = idx_info->layout;
+        udata.common.layout  = idx_info->layout;
         udata.common.storage = idx_info->storage;
         HDmemset(&udata.chunk_rec, 0, sizeof(udata.chunk_rec));
         udata.filtered = (idx_info->pline->nused > 0);
-        if(!udata.filtered) {
-            udata.chunk_rec.nbytes = idx_info->layout->size;
+        if (!udata.filtered) {
+            udata.chunk_rec.nbytes      = idx_info->layout->size;
             udata.chunk_rec.filter_mask = 0;
         } /* end if */
-        udata.cb = chunk_cb;
+        udata.cb    = chunk_cb;
         udata.udata = chunk_udata;
 
         /* Iterate over the fixed array elements */
-        if((ret_value = H5FA_iterate(fa, H5D__farray_idx_iterate_cb, &udata)) < 0)
+        if ((ret_value = H5FA_iterate(fa, H5D__farray_idx_iterate_cb, &udata)) < 0)
             HERROR(H5E_DATASET, H5E_BADITER, "unable to iterate over fixed array chunk index");
     } /* end if */
 
@@ -1235,7 +1210,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_iterate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_remove
  *
@@ -1251,9 +1225,9 @@ done:
 static herr_t
 H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *udata)
 {
-    H5FA_t      *fa;        /* Pointer to fixed array structure */
-    hsize_t     idx;        /* Array index of chunk */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5FA_t *fa;                  /* Pointer to fixed array structure */
+    hsize_t idx;                 /* Array index of chunk */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1267,61 +1241,63 @@ H5D__farray_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t
     HDassert(udata);
 
     /* Check if the fixed array is open yet */
-    if(NULL == idx_info->storage->u.farray.fa) {
+    if (NULL == idx_info->storage->u.farray.fa) {
         /* Open the fixed array in file */
-        if(H5D__farray_idx_open(idx_info) < 0)
+        if (H5D__farray_idx_open(idx_info) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array")
-    } else  /* Patch the top level file pointer contained in fa if needed */
-        if(H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch fixed array file pointer")
+    }
+    else /* Patch the top level file pointer contained in fa if needed */
+        if (H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch fixed array file pointer")
 
     /* Set convenience pointer to fixed array structure */
     fa = idx_info->storage->u.farray.fa;
 
     /* Calculate the index of this chunk */
-    idx = H5VM_array_offset_pre((idx_info->layout->ndims - 1), idx_info->layout->max_down_chunks, udata->scaled);
+    idx = H5VM_array_offset_pre((idx_info->layout->ndims - 1), idx_info->layout->max_down_chunks,
+                                udata->scaled);
 
     /* Check for filters on chunks */
-    if(idx_info->pline->nused > 0) {
-        H5D_farray_filt_elmt_t elmt;            /* Fixed array element */
+    if (idx_info->pline->nused > 0) {
+        H5D_farray_filt_elmt_t elmt; /* Fixed array element */
 
         /* Get the info about the chunk for the index */
-        if(H5FA_get(fa, idx, &elmt) < 0)
+        if (H5FA_get(fa, idx, &elmt) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk info")
 
         /* Remove raw data chunk from file if not doing SWMR writes */
         HDassert(H5F_addr_defined(elmt.addr));
-        if(!(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)) {
-            H5_CHECK_OVERFLOW(elmt.nbytes, /*From: */uint32_t, /*To: */hsize_t);
-            if(H5MF_xfree(idx_info->f, H5FD_MEM_DRAW, elmt.addr, (hsize_t)elmt.nbytes) < 0)
+        if (!(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)) {
+            H5_CHECK_OVERFLOW(elmt.nbytes, /*From: */ uint32_t, /*To: */ hsize_t);
+            if (H5MF_xfree(idx_info->f, H5FD_MEM_DRAW, elmt.addr, (hsize_t)elmt.nbytes) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to free chunk")
         } /* end if */
 
         /* Reset the info about the chunk for the index */
-        elmt.addr = HADDR_UNDEF;
-        elmt.nbytes = 0;
+        elmt.addr        = HADDR_UNDEF;
+        elmt.nbytes      = 0;
         elmt.filter_mask = 0;
-        if(H5FA_set(fa, idx, &elmt) < 0)
+        if (H5FA_set(fa, idx, &elmt) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to reset chunk info")
     } /* end if */
     else {
-        haddr_t     addr = HADDR_UNDEF;     /* Chunk address */
+        haddr_t addr = HADDR_UNDEF; /* Chunk address */
 
         /* Get the address of the chunk for the index */
-        if(H5FA_get(fa, idx, &addr) < 0)
+        if (H5FA_get(fa, idx, &addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address")
 
         /* Remove raw data chunk from file if not doing SWMR writes */
         HDassert(H5F_addr_defined(addr));
-        if(!(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)) {
-            H5_CHECK_OVERFLOW(idx_info->layout->size, /*From: */uint32_t, /*To: */hsize_t);
-            if(H5MF_xfree(idx_info->f, H5FD_MEM_DRAW, addr, (hsize_t)idx_info->layout->size) < 0)
+        if (!(H5F_INTENT(idx_info->f) & H5F_ACC_SWMR_WRITE)) {
+            H5_CHECK_OVERFLOW(idx_info->layout->size, /*From: */ uint32_t, /*To: */ hsize_t);
+            if (H5MF_xfree(idx_info->f, H5FD_MEM_DRAW, addr, (hsize_t)idx_info->layout->size) < 0)
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "unable to free chunk")
         } /* end if */
 
         /* Reset the address of the chunk for the index */
         addr = HADDR_UNDEF;
-        if(H5FA_set(fa, idx, &addr) < 0)
+        if (H5FA_set(fa, idx, &addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTSET, FAIL, "unable to reset chunk address")
     } /* end else */
 
@@ -1329,7 +1305,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5D__farray_idx_remove() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_delete_cb
  *
@@ -1346,8 +1321,8 @@ done:
 static int
 H5D__farray_idx_delete_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
 {
-    H5F_t *f = (H5F_t *)_udata;         /* User data for callback */
-    int ret_value = H5_ITER_CONT;       /* Return value */
+    H5F_t *f         = (H5F_t *)_udata; /* User data for callback */
+    int    ret_value = H5_ITER_CONT;    /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1358,15 +1333,14 @@ H5D__farray_idx_delete_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
     HDassert(f);
 
     /* Remove raw data chunk from file */
-    H5_CHECK_OVERFLOW(chunk_rec->nbytes, /*From: */uint32_t, /*To: */hsize_t);
-    if(H5MF_xfree(f, H5FD_MEM_DRAW, chunk_rec->chunk_addr, (hsize_t)chunk_rec->nbytes) < 0)
+    H5_CHECK_OVERFLOW(chunk_rec->nbytes, /*From: */ uint32_t, /*To: */ hsize_t);
+    if (H5MF_xfree(f, H5FD_MEM_DRAW, chunk_rec->chunk_addr, (hsize_t)chunk_rec->nbytes) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, H5_ITER_ERROR, "unable to free chunk")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_delete_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_delete
  *
@@ -1384,7 +1358,7 @@ done:
 static herr_t
 H5D__farray_idx_delete(const H5D_chk_idx_info_t *idx_info)
 {
-    herr_t ret_value = SUCCEED;     /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1396,24 +1370,24 @@ H5D__farray_idx_delete(const H5D_chk_idx_info_t *idx_info)
     HDassert(idx_info->storage);
 
     /* Check if the index data structure has been allocated */
-    if(H5F_addr_defined(idx_info->storage->idx_addr)) {
-        H5D_farray_ctx_ud_t ctx_udata;  /* User data for fixed array open call */
+    if (H5F_addr_defined(idx_info->storage->idx_addr)) {
+        H5D_farray_ctx_ud_t ctx_udata; /* User data for fixed array open call */
 
         /* Iterate over the chunk addresses in the fixed array, deleting each chunk */
-        if(H5D__farray_idx_iterate(idx_info, H5D__farray_idx_delete_cb, idx_info->f) < 0)
+        if (H5D__farray_idx_iterate(idx_info, H5D__farray_idx_delete_cb, idx_info->f) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to iterate over chunk addresses")
 
         /* Close fixed array */
-        if(H5FA_close(idx_info->storage->u.farray.fa) < 0)
+        if (H5FA_close(idx_info->storage->u.farray.fa) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to close fixed array")
         idx_info->storage->u.farray.fa = NULL;
 
         /* Set up the user data */
-        ctx_udata.f = idx_info->f;
+        ctx_udata.f          = idx_info->f;
         ctx_udata.chunk_size = idx_info->layout->size;
 
         /* Delete fixed array */
-        if(H5FA_delete(idx_info->f, idx_info->storage->idx_addr, &ctx_udata) < 0)
+        if (H5FA_delete(idx_info->f, idx_info->storage->idx_addr, &ctx_udata) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to delete chunk fixed array")
         idx_info->storage->idx_addr = HADDR_UNDEF;
     } /* end if */
@@ -1424,7 +1398,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_delete() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_copy_setup
  *
@@ -1438,10 +1411,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
-    const H5D_chk_idx_info_t *idx_info_dst)
+H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk_idx_info_t *idx_info_dst)
 {
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1459,16 +1431,16 @@ H5D__farray_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
     HDassert(!H5F_addr_defined(idx_info_dst->storage->idx_addr));
 
     /* Check if the source fixed array is open yet */
-    if(NULL == idx_info_src->storage->u.farray.fa)
+    if (NULL == idx_info_src->storage->u.farray.fa)
         /* Open the fixed array in file */
-        if(H5D__farray_idx_open(idx_info_src) < 0)
+        if (H5D__farray_idx_open(idx_info_src) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array")
 
     /* Set copied metadata tag */
     H5_BEGIN_TAG(H5AC__COPIED_TAG);
 
     /* Create the fixed array that describes chunked storage in the dest. file */
-    if(H5D__farray_idx_create(idx_info_dst) < 0)
+    if (H5D__farray_idx_create(idx_info_dst) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize chunked storage")
     HDassert(H5F_addr_defined(idx_info_dst->storage->idx_addr));
 
@@ -1479,7 +1451,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_copy_setup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_copy_shutdown
  *
@@ -1493,10 +1464,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__farray_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
-    H5O_storage_chunk_t *storage_dst)
+H5D__farray_idx_copy_shutdown(H5O_storage_chunk_t *storage_src, H5O_storage_chunk_t *storage_dst)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1507,10 +1477,10 @@ H5D__farray_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
     HDassert(storage_dst->u.farray.fa);
 
     /* Close fixed arrays */
-    if(H5FA_close(storage_src->u.farray.fa) < 0)
+    if (H5FA_close(storage_src->u.farray.fa) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to close fixed array")
     storage_src->u.farray.fa = NULL;
-    if(H5FA_close(storage_dst->u.farray.fa) < 0)
+    if (H5FA_close(storage_dst->u.farray.fa) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to close fixed array")
     storage_dst->u.farray.fa = NULL;
 
@@ -1518,7 +1488,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_copy_shutdown() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_size
  *
@@ -1535,9 +1504,9 @@ done:
 static herr_t
 H5D__farray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
 {
-    H5FA_t      *fa;                    /* Pointer to fixed array structure */
-    H5FA_stat_t fa_stat;                /* Fixed array statistics */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FA_t *    fa;                  /* Pointer to fixed array structure */
+    H5FA_stat_t fa_stat;             /* Fixed array statistics */
+    herr_t      ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1551,22 +1520,22 @@ H5D__farray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
     HDassert(index_size);
 
     /* Open the fixed array in file */
-    if(H5D__farray_idx_open(idx_info) < 0)
+    if (H5D__farray_idx_open(idx_info) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't open fixed array")
 
     /* Set convenience pointer to fixed array structure */
     fa = idx_info->storage->u.farray.fa;
 
     /* Get the fixed array statistics */
-    if(H5FA_get_stats(fa, &fa_stat) < 0)
+    if (H5FA_get_stats(fa, &fa_stat) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query fixed array statistics")
 
     *index_size = fa_stat.hdr_size;
     *index_size += fa_stat.dblk_size;
 
 done:
-    if(idx_info->storage->u.farray.fa) {
-        if(H5FA_close(idx_info->storage->u.farray.fa) < 0)
+    if (idx_info->storage->u.farray.fa) {
+        if (H5FA_close(idx_info->storage->u.farray.fa) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to close fixed array")
         idx_info->storage->u.farray.fa = NULL;
     } /* end if */
@@ -1574,7 +1543,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_reset
  *
@@ -1596,14 +1564,13 @@ H5D__farray_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
     HDassert(storage);
 
     /* Reset index info */
-    if(reset_addr)
+    if (reset_addr)
         storage->idx_addr = HADDR_UNDEF;
     storage->u.farray.fa = NULL;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_idx_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_dump
  *
@@ -1630,7 +1597,6 @@ H5D__farray_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__farray_idx_dump() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__farray_idx_dest
  *
@@ -1646,7 +1612,7 @@ H5D__farray_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
 static herr_t
 H5D__farray_idx_dest(const H5D_chk_idx_info_t *idx_info)
 {
-    herr_t      ret_value = SUCCEED;       /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -1656,14 +1622,14 @@ H5D__farray_idx_dest(const H5D_chk_idx_info_t *idx_info)
     HDassert(idx_info->storage);
 
     /* Check if the fixed array is open */
-    if(idx_info->storage->u.farray.fa) {
+    if (idx_info->storage->u.farray.fa) {
 
         /* Patch the top level file pointer contained in fa if needed */
-        if(H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f) < 0)
+        if (H5FA_patch_file(idx_info->storage->u.farray.fa, idx_info->f) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch fixed array file pointer")
 
         /* Close fixed array */
-        if(H5FA_close(idx_info->storage->u.farray.fa) < 0)
+        if (H5FA_close(idx_info->storage->u.farray.fa) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTCLOSEOBJ, FAIL, "unable to close fixed array")
         idx_info->storage->u.farray.fa = NULL;
     } /* end if */
@@ -1671,4 +1637,3 @@ H5D__farray_idx_dest(const H5D_chk_idx_info_t *idx_info)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__farray_idx_dest() */
-